Merge "Deprecate supplicant related stuff in WifiManager" (e7a379cd) · Commits · e / os / android_frameworks_base

api/current.txt

+6 −6

Original line number	Diff line number	Diff line
		@@ -27998,23 +27998,23 @@ package android.net.wifi {
		method public int updateNetwork(android.net.wifi.WifiConfiguration);
		field public static final java.lang.String ACTION_PICK_WIFI_NETWORK = "android.net.wifi.PICK_WIFI_NETWORK";
		field public static final java.lang.String ACTION_REQUEST_SCAN_ALWAYS_AVAILABLE = "android.net.wifi.action.REQUEST_SCAN_ALWAYS_AVAILABLE";
		field public static final int ERROR_AUTHENTICATING = 1; // 0x1
		field public static final deprecated int ERROR_AUTHENTICATING = 1; // 0x1
		field public static final deprecated java.lang.String EXTRA_BSSID = "bssid";
		field public static final java.lang.String EXTRA_NETWORK_INFO = "networkInfo";
		field public static final java.lang.String EXTRA_NEW_RSSI = "newRssi";
		field public static final java.lang.String EXTRA_NEW_STATE = "newState";
		field public static final deprecated java.lang.String EXTRA_NEW_STATE = "newState";
		field public static final java.lang.String EXTRA_PREVIOUS_WIFI_STATE = "previous_wifi_state";
		field public static final java.lang.String EXTRA_RESULTS_UPDATED = "resultsUpdated";
		field public static final java.lang.String EXTRA_SUPPLICANT_CONNECTED = "connected";
		field public static final java.lang.String EXTRA_SUPPLICANT_ERROR = "supplicantError";
		field public static final deprecated java.lang.String EXTRA_SUPPLICANT_CONNECTED = "connected";
		field public static final deprecated java.lang.String EXTRA_SUPPLICANT_ERROR = "supplicantError";
		field public static final deprecated java.lang.String EXTRA_WIFI_INFO = "wifiInfo";
		field public static final java.lang.String EXTRA_WIFI_STATE = "wifi_state";
		field public static final java.lang.String NETWORK_IDS_CHANGED_ACTION = "android.net.wifi.NETWORK_IDS_CHANGED";
		field public static final java.lang.String NETWORK_STATE_CHANGED_ACTION = "android.net.wifi.STATE_CHANGE";
		field public static final java.lang.String RSSI_CHANGED_ACTION = "android.net.wifi.RSSI_CHANGED";
		field public static final java.lang.String SCAN_RESULTS_AVAILABLE_ACTION = "android.net.wifi.SCAN_RESULTS";
		field public static final java.lang.String SUPPLICANT_CONNECTION_CHANGE_ACTION = "android.net.wifi.supplicant.CONNECTION_CHANGE";
		field public static final java.lang.String SUPPLICANT_STATE_CHANGED_ACTION = "android.net.wifi.supplicant.STATE_CHANGE";
		field public static final deprecated java.lang.String SUPPLICANT_CONNECTION_CHANGE_ACTION = "android.net.wifi.supplicant.CONNECTION_CHANGE";
		field public static final deprecated java.lang.String SUPPLICANT_STATE_CHANGED_ACTION = "android.net.wifi.supplicant.STATE_CHANGE";
		field public static final int WIFI_MODE_FULL = 1; // 0x1
		field public static final int WIFI_MODE_FULL_HIGH_PERF = 3; // 0x3
		field public static final int WIFI_MODE_SCAN_ONLY = 2; // 0x2

wifi/java/android/net/wifi/WifiManager.java

+24 −0

Original line number	Diff line number	Diff line
		@@ -99,35 +99,45 @@ public class WifiManager {
		// Supplicant error codes:
		/**
		* The error code if there was a problem authenticating.
		* @deprecated This is no longer supported.
		*/
		@Deprecated
		public static final int ERROR_AUTHENTICATING = 1;

		/**
		* The reason code if there is no error during authentication.
		* It could also imply that there no authentication in progress,
		* this reason code also serves as a reset value.
		* @deprecated This is no longer supported.
		* @hide
		*/
		@Deprecated
		public static final int ERROR_AUTH_FAILURE_NONE = 0;

		/**
		* The reason code if there was a timeout authenticating.
		* @deprecated This is no longer supported.
		* @hide
		*/
		@Deprecated
		public static final int ERROR_AUTH_FAILURE_TIMEOUT = 1;

		/**
		* The reason code if there was a wrong password while
		* authenticating.
		* @deprecated This is no longer supported.
		* @hide
		*/
		@Deprecated
		public static final int ERROR_AUTH_FAILURE_WRONG_PSWD = 2;

		/**
		* The reason code if there was EAP failure while
		* authenticating.
		* @deprecated This is no longer supported.
		* @hide
		*/
		@Deprecated
		public static final int ERROR_AUTH_FAILURE_EAP_FAILURE = 3;

		/**
		@@ -565,8 +575,10 @@ public class WifiManager {
		* to perform Wi-Fi operations) or the connection to the supplicant has been
		* lost. One extra provides the connection state as a boolean, where {@code true}
		* means CONNECTED.
		* @deprecated This is no longer supported.
		* @see #EXTRA_SUPPLICANT_CONNECTED
		*/
		@Deprecated
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String SUPPLICANT_CONNECTION_CHANGE_ACTION =
		"android.net.wifi.supplicant.CONNECTION_CHANGE";
		@@ -575,7 +587,9 @@ public class WifiManager {
		* the supplicant daemon has been gained or lost. {@code true} means
		* a connection now exists.
		* Retrieve it with {@link android.content.Intent#getBooleanExtra(String,boolean)}.
		* @deprecated This is no longer supported.
		*/
		@Deprecated
		public static final String EXTRA_SUPPLICANT_CONNECTED = "connected";
		/**
		* Broadcast intent action indicating that the state of Wi-Fi connectivity
		@@ -612,7 +626,9 @@ public class WifiManager {
		* the overall state of connectivity.
		* @see #EXTRA_NEW_STATE
		* @see #EXTRA_SUPPLICANT_ERROR
		* @deprecated This is no longer supported.
		*/
		@Deprecated
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String SUPPLICANT_STATE_CHANGED_ACTION =
		"android.net.wifi.supplicant.STATE_CHANGE";
		@@ -620,7 +636,9 @@ public class WifiManager {
		* The lookup key for a {@link SupplicantState} describing the new state
		* Retrieve with
		* {@link android.content.Intent#getParcelableExtra(String)}.
		* @deprecated This is no longer supported.
		*/
		@Deprecated
		public static final String EXTRA_NEW_STATE = "newState";

		/**
		@@ -629,7 +647,9 @@ public class WifiManager {
		* Retrieve with
		* {@link android.content.Intent#getIntExtra(String, int)}.
		* @see #ERROR_AUTHENTICATING
		* @deprecated This is no longer supported.
		*/
		@Deprecated
		public static final String EXTRA_SUPPLICANT_ERROR = "supplicantError";

		/**
		@@ -638,8 +658,10 @@ public class WifiManager {
		* Retrieve with
		* {@link android.content.Intent#getIntExtra(String, int)}.
		* @see #ERROR_AUTH_FAILURE_#REASON_CODE
		* @deprecated This is no longer supported.
		* @hide
		*/
		@Deprecated
		public static final String EXTRA_SUPPLICANT_ERROR_REASON = "supplicantErrorReason";

		/**
		@@ -3617,8 +3639,10 @@ public class WifiManager {
		* Restore state from the older version of back up data.
		* The old backup data was essentially a backup of wpa_supplicant.conf
		* and ipconfig.txt file.
		* @deprecated this is no longer supported.
		* @hide
		*/
		@Deprecated
		public void restoreSupplicantBackupData(byte[] supplicantData, byte[] ipConfigData) {
		try {
		mService.restoreSupplicantBackupData(supplicantData, ipConfigData);