commit 8588e47358878b7a1add2bd1df2ade95091cdb8d
author Robert Greenwalt <rgreenwalt@google.com> Tue Nov 08 10:12:25 2011 -0800
committer Robert Greenwalt <rgreenwalt@google.com> Tue Nov 08 10:12:25 2011 -0800
tree 265632004f5a4883c76773661aefa9e1f8662025
parent 148c7d0de720a92632aa6ed10a39bfc38b427239

Fix build.

Missed a commit that fixed some issues.
bug:5237167

Change-Id: I61e44831e2c3f1cf613ca1387aa95d712b7d2ded

core/java/android/provider/Settings.java

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index f27f13a..b032169 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -1182,6 +1182,9 @@
          */
         public static final String RADIO_WIFI = "wifi";
 
+        /**
+         * {@hide}
+         */
         public static final String RADIO_WIMAX = "wimax";
         /**
          * Constant for use in AIRPLANE_MODE_RADIOS to specify Cellular radio.
@@ -2900,6 +2903,9 @@
          */
         public static final String WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON =
                 "wifi_networks_available_notification_on";
+        /**
+         * {@hide}
+         */
         public static final String WIMAX_NETWORKS_AVAILABLE_NOTIFICATION_ON =
                 "wimax_networks_available_notification_on";
 

core/res/AndroidManifest.xml

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 1b5cbb4..0ed0523 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -423,6 +423,7 @@
         android:description="@string/permdesc_accessWifiState"
         android:label="@string/permlab_accessWifiState" />
 
+    <!-- @hide -->
     <permission android:name="android.permission.ACCESS_WIMAX_STATE"
         android:permissionGroup="android.permission-group.NETWORK"
         android:protectionLevel="normal"
@@ -989,6 +990,7 @@
         android:description="@string/permdesc_changeWifiState"
         android:label="@string/permlab_changeWifiState" />
 
+    <!-- @hide -->
     <permission android:name="android.permission.CHANGE_WIMAX_STATE"
         android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
         android:protectionLevel="dangerous"

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

diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index 6e689c5..4af6112 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -500,7 +500,7 @@
                 break;
             case ConnectivityManager.TYPE_WIMAX:
                 mNetTrackers[netType] = makeWimaxStateTracker();
-                if (mNetTrackers[netType != null) {
+                if (mNetTrackers[netType]!= null) {
                     mNetTrackers[netType].startMonitoring(context, mHandler);
                 }
                 break;