Merge "Wifi: Disable network when detecting carrier eap error" (1ecd270d) · Commits · e / os / android_frameworks_base

wifi/api/system-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -398,6 +398,8 @@ package android.net.wifi {
		method @Deprecated public boolean hasEverConnected();
		field @Deprecated public static final int DISABLED_ASSOCIATION_REJECTION = 1; // 0x1
		field @Deprecated public static final int DISABLED_AUTHENTICATION_FAILURE = 2; // 0x2
		field @Deprecated public static final int DISABLED_AUTHENTICATION_FAILURE_CARRIER_SPECIFIC = 10; // 0xa
		field @Deprecated public static final int DISABLED_AUTHENTICATION_FAILURE_GENERIC = 2; // 0x2
		field @Deprecated public static final int DISABLED_AUTHENTICATION_NO_CREDENTIALS = 5; // 0x5
		field @Deprecated public static final int DISABLED_AUTHENTICATION_NO_SUBSCRIPTION = 9; // 0x9
		field @Deprecated public static final int DISABLED_BY_WIFI_MANAGER = 7; // 0x7

wifi/java/android/net/wifi/WifiConfiguration.java

+28 −4

Original line number	Diff line number	Diff line
		@@ -1708,7 +1708,9 @@ public class WifiConfiguration implements Parcelable {
		DISABLED_NO_INTERNET_PERMANENT,
		DISABLED_BY_WIFI_MANAGER,
		DISABLED_BY_WRONG_PASSWORD,
		DISABLED_AUTHENTICATION_NO_SUBSCRIPTION})
		DISABLED_AUTHENTICATION_NO_SUBSCRIPTION,
		DISABLED_AUTHENTICATION_FAILURE_GENERIC,
		DISABLED_AUTHENTICATION_FAILURE_CARRIER_SPECIFIC})
		public @interface NetworkSelectionDisableReason {}

		// Quality Network disabled reasons
		@@ -1721,8 +1723,16 @@ public class WifiConfiguration implements Parcelable {
		public static final int NETWORK_SELECTION_DISABLED_STARTING_INDEX = 1;
		/** This network is temporarily disabled because of multiple association rejections. */
		public static final int DISABLED_ASSOCIATION_REJECTION = 1;
		/** This network is temporarily disabled because of multiple authentication failure. */
		public static final int DISABLED_AUTHENTICATION_FAILURE = 2;
		/** This network is disabled due to generic authentication failure. */
		public static final int DISABLED_AUTHENTICATION_FAILURE_GENERIC = 2;
		/** Separate DISABLED_AUTHENTICATION_FAILURE into DISABLED_AUTHENTICATION_FAILURE_GENERIC
		* and DISABLED_AUTHENTICATION_FAILURE_CARRIER_SPECIFIC
		* @deprecated Use the {@link #DISABLED_AUTHENTICATION_FAILURE_GENERIC} constant
		* (which is the same value).
		*/
		@Deprecated
		public static final int DISABLED_AUTHENTICATION_FAILURE =
		DISABLED_AUTHENTICATION_FAILURE_GENERIC;
		/** This network is temporarily disabled because of multiple DHCP failure. */
		public static final int DISABLED_DHCP_FAILURE = 3;
		/** This network is temporarily disabled because it has no Internet access. */
		@@ -1740,11 +1750,13 @@ public class WifiConfiguration implements Parcelable {
		public static final int DISABLED_BY_WRONG_PASSWORD = 8;
		/** This network is permanently disabled because service is not subscribed. */
		public static final int DISABLED_AUTHENTICATION_NO_SUBSCRIPTION = 9;
		/** This network is disabled due to carrier specific EAP failure. */
		public static final int DISABLED_AUTHENTICATION_FAILURE_CARRIER_SPECIFIC = 10;
		/**
		* All other disable reasons should be strictly less than this value.
		* @hide
		*/
		public static final int NETWORK_SELECTION_DISABLED_MAX = 10;
		public static final int NETWORK_SELECTION_DISABLED_MAX = 11;

		/**
		* Get an integer that is equal to the maximum integer value of all the
		@@ -1884,6 +1896,18 @@ public class WifiConfiguration implements Parcelable {
		1,
		Integer.MAX_VALUE));

		reasons.append(DISABLED_AUTHENTICATION_FAILURE_GENERIC,
		new DisableReasonInfo(
		"NETWORK_SELECTION_DISABLED_AUTHENTICATION_FAILURE_GENERIC",
		5,
		5 * 60 * 1000));

		reasons.append(DISABLED_AUTHENTICATION_FAILURE_CARRIER_SPECIFIC,
		new DisableReasonInfo(
		"NETWORK_SELECTION_DISABLED_AUTHENTICATION_FAILURE_CARRIER_SPECIFIC",
		1,
		Integer.MAX_VALUE));

		return reasons;
		}