Skip to content

Commit 8588e47

Browse files
author
Robert Greenwalt
committed
Fix build.
Missed a commit that fixed some issues. bug:5237167 Change-Id: I61e44831e2c3f1cf613ca1387aa95d712b7d2ded
1 parent 148c7d0 commit 8588e47

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

core/java/android/provider/Settings.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1182,6 +1182,9 @@ public static void setShowGTalkServiceStatus(ContentResolver cr, boolean flag) {
11821182
*/
11831183
public static final String RADIO_WIFI = "wifi";
11841184

1185+
/**
1186+
* {@hide}
1187+
*/
11851188
public static final String RADIO_WIMAX = "wimax";
11861189
/**
11871190
* Constant for use in AIRPLANE_MODE_RADIOS to specify Cellular radio.
@@ -2900,6 +2903,9 @@ public static final String getBluetoothInputDevicePriorityKey(String address) {
29002903
*/
29012904
public static final String WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON =
29022905
"wifi_networks_available_notification_on";
2906+
/**
2907+
* {@hide}
2908+
*/
29032909
public static final String WIMAX_NETWORKS_AVAILABLE_NOTIFICATION_ON =
29042910
"wimax_networks_available_notification_on";
29052911

core/res/AndroidManifest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,7 @@
423423
android:description="@string/permdesc_accessWifiState"
424424
android:label="@string/permlab_accessWifiState" />
425425

426+
<!-- @hide -->
426427
<permission android:name="android.permission.ACCESS_WIMAX_STATE"
427428
android:permissionGroup="android.permission-group.NETWORK"
428429
android:protectionLevel="normal"
@@ -989,6 +990,7 @@
989990
android:description="@string/permdesc_changeWifiState"
990991
android:label="@string/permlab_changeWifiState" />
991992

993+
<!-- @hide -->
992994
<permission android:name="android.permission.CHANGE_WIMAX_STATE"
993995
android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
994996
android:protectionLevel="dangerous"

services/java/com/android/server/ConnectivityService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ public ConnectivityService(Context context, INetworkManagementService netd,
500500
break;
501501
case ConnectivityManager.TYPE_WIMAX:
502502
mNetTrackers[netType] = makeWimaxStateTracker();
503-
if (mNetTrackers[netType != null) {
503+
if (mNetTrackers[netType]!= null) {
504504
mNetTrackers[netType].startMonitoring(context, mHandler);
505505
}
506506
break;

0 commit comments

Comments
 (0)