summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2011-11-08 10:31:37 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-11-08 10:31:37 -0800
commit604019c8d45b8c56cf48b03dbd92cfbdd29c48c1 (patch)
tree91ff6b48e0b066689effbca01bb85c0006ff740b
parent8689afbd63db3b1af6058709da843ea9d6433b21 (diff)
parent8588e47358878b7a1add2bd1df2ade95091cdb8d (diff)
downloadframeworks_base-604019c8d45b8c56cf48b03dbd92cfbdd29c48c1.zip
frameworks_base-604019c8d45b8c56cf48b03dbd92cfbdd29c48c1.tar.gz
frameworks_base-604019c8d45b8c56cf48b03dbd92cfbdd29c48c1.tar.bz2
Merge "Fix build." into ics-mr1
-rw-r--r--core/java/android/provider/Settings.java6
-rw-r--r--core/res/AndroidManifest.xml2
-rw-r--r--services/java/com/android/server/ConnectivityService.java2
3 files changed, 9 insertions, 1 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 7000e75..769776e 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -1182,6 +1182,9 @@ public final class Settings {
*/
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 final class Settings {
*/
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";
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"
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 @@ public class ConnectivityService extends IConnectivityManager.Stub {
break;
case ConnectivityManager.TYPE_WIMAX:
mNetTrackers[netType] = makeWimaxStateTracker();
- if (mNetTrackers[netType != null) {
+ if (mNetTrackers[netType]!= null) {
mNetTrackers[netType].startMonitoring(context, mHandler);
}
break;