resolved conflicts for merge of ea54b760 to master (c1b3cbe1) · Commits · e / os / android_frameworks_base

core/java/android/net/wimax/WimaxManagerConstants.java

0 → 100644

+104 −0

Original line number	Diff line number	Diff line
		package android.net.wimax;

		/**
		* {@hide}
		*/
		public class WimaxManagerConstants
		{

		/**
		* Used by android.net.wimax.WimaxManager for handling management of
		* Wimax access.
		*/
		public static final String WIMAX_SERVICE = "WiMax";

		/**
		* Broadcast intent action indicating that Wimax has been enabled, disabled,
		* enabling, disabling, or unknown. One extra provides this state as an int.
		* Another extra provides the previous state, if available.
		*/
		public static final String NET_4G_STATE_CHANGED_ACTION =
		"android.net.fourG.NET_4G_STATE_CHANGED";

		/**
		* The lookup key for an int that indicates whether Wimax is enabled,
		* disabled, enabling, disabling, or unknown.
		*/
		public static final String EXTRA_WIMAX_STATUS = "wimax_status";

		/**
		* Broadcast intent action indicating that Wimax state has been changed
		* state could be scanning, connecting, connected, disconnecting, disconnected
		* initializing, initialized, unknown and ready. One extra provides this state as an int.
		* Another extra provides the previous state, if available.
		*/
		public static final String WIMAX_NETWORK_STATE_CHANGED_ACTION =
		"android.net.fourG.wimax.WIMAX_NETWORK_STATE_CHANGED";

		/**
		* Broadcast intent action indicating that Wimax signal level has been changed.
		* Level varies from 0 to 3.
		*/
		public static final String SIGNAL_LEVEL_CHANGED_ACTION =
		"android.net.wimax.SIGNAL_LEVEL_CHANGED";

		/**
		* The lookup key for an int that indicates whether Wimax state is
		* scanning, connecting, connected, disconnecting, disconnected
		* initializing, initialized, unknown and ready.
		*/
		public static final String EXTRA_WIMAX_STATE = "WimaxState";
		public static final String EXTRA_4G_STATE = "4g_state";
		public static final String EXTRA_WIMAX_STATE_INT = "WimaxStateInt";
		/**
		* The lookup key for an int that indicates whether state of Wimax
		* is idle.
		*/
		public static final String EXTRA_WIMAX_STATE_DETAIL = "WimaxStateDetail";

		/**
		* The lookup key for an int that indicates Wimax signal level.
		*/
		public static final String EXTRA_NEW_SIGNAL_LEVEL = "newSignalLevel";

		/**
		* Indicatates Wimax is disabled.
		*/
		public static final int NET_4G_STATE_DISABLED = 1;

		/**
		* Indicatates Wimax is enabled.
		*/
		public static final int NET_4G_STATE_ENABLED = 3;

		/**
		* Indicatates Wimax status is known.
		*/
		public static final int NET_4G_STATE_UNKNOWN = 4;

		/**
		* Indicatates Wimax is in idle state.
		*/
		public static final int WIMAX_IDLE = 6;

		/**
		* Indicatates Wimax is being deregistered.
		*/
		public static final int WIMAX_DEREGISTRATION = 8;

		/**
		* Indicatates wimax state is unknown.
		*/
		public static final int WIMAX_STATE_UNKNOWN = 0;

		/**
		* Indicatates wimax state is connected.
		*/
		public static final int WIMAX_STATE_CONNECTED = 7;

		/**
		* Indicatates wimax state is disconnected.
		*/
		public static final int WIMAX_STATE_DISCONNECTED = 9;

		}

core/java/android/provider/Settings.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -1202,6 +1202,7 @@ public final class Settings {
		*/
		public static final String RADIO_WIFI = "wifi";

		public static final String RADIO_WIMAX = "wimax";
		/**
		* Constant for use in AIRPLANE_MODE_RADIOS to specify Cellular radio.
		*/
		@@ -2919,6 +2920,8 @@ public final class Settings {
		*/
		public static final String WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON =
		"wifi_networks_available_notification_on";
		public static final String WIMAX_NETWORKS_AVAILABLE_NOTIFICATION_ON =
		"wimax_networks_available_notification_on";

		/**
		* Delay (in seconds) before repeating the Wi-Fi networks available notification.

core/res/AndroidManifest.xml

+10 −0

Original line number	Diff line number	Diff line
		@@ -423,6 +423,11 @@
		android:description="@string/permdesc_accessWifiState"
		android:label="@string/permlab_accessWifiState" />

		<permission android:name="android.permission.ACCESS_WIMAX_STATE"
		android:permissionGroup="android.permission-group.NETWORK"
		android:protectionLevel="normal"
		android:description="@string/permdesc_accessWimaxState"
		android:label="@string/permlab_accessWimaxState" />
		<!-- Allows applications to connect to paired bluetooth devices -->
		<permission android:name="android.permission.BLUETOOTH"
		android:permissionGroup="android.permission-group.NETWORK"
		@@ -984,6 +989,11 @@
		android:description="@string/permdesc_changeWifiState"
		android:label="@string/permlab_changeWifiState" />

		<permission android:name="android.permission.CHANGE_WIMAX_STATE"
		android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
		android:protectionLevel="dangerous"
		android:description="@string/permdesc_changeWimaxState"
		android:label="@string/permlab_changeWimaxState" />
		<!-- Allows applications to enter Wi-Fi Multicast mode -->
		<permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"
		android:permissionGroup="android.permission-group.SYSTEM_TOOLS"

core/res/res/drawable-hdpi/stat_sys_data_wimax_signal_3_fully.png

0 → 100644

+2.17 KiB

Loading image diff...

core/res/res/drawable-hdpi/stat_sys_data_wimax_signal_disconnected.png

0 → 100644

+1.76 KiB

Loading image diff...