commit a74ebb6d08e691e1b5802f40b19b27dc0bbf24d5
author Robert Greenwalt <rgreenwalt@google.com> Tue Nov 08 18:33:20 2011 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 08 18:33:20 2011 +0000
tree e1a56c730ded35f098f751427d0858f6caf50707
parent a7d41ece61cb6507c894ca686f627881d814dbe2
parent 604019c8d45b8c56cf48b03dbd92cfbdd29c48c1

am 604019c8: Merge "Fix build." into ics-mr1

* commit '604019c8d45b8c56cf48b03dbd92cfbdd29c48c1':
  Fix build.

core/java/android/provider/Settings.java

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 894ebfa..351841e 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.
@@ -2912,6 +2915,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 0aec138..cfe3e1b 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;