Merge "Fix build." into ics-mr1 (604019c8) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -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";

+2 −0

Original line number	Diff line number	Diff line
		@@ -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"

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;