Merge "EAP-AKA' : Add support of EAP-AKA' in WiFi Enterprise methods" into m-wireless-dev (6a037241) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -18058,6 +18058,7 @@ package android.net.wifi {

		public static final class WifiEnterpriseConfig.Eap {
		field public static final int AKA = 5; // 0x5
		field public static final int AKA_PRIME = 6; // 0x6
		field public static final int NONE = -1; // 0xffffffff
		field public static final int PEAP = 0; // 0x0
		field public static final int PWD = 3; // 0x3

+1 −0

Original line number	Diff line number	Diff line
		@@ -19568,6 +19568,7 @@ package android.net.wifi {

		public static final class WifiEnterpriseConfig.Eap {
		field public static final int AKA = 5; // 0x5
		field public static final int AKA_PRIME = 6; // 0x6
		field public static final int NONE = -1; // 0xffffffff
		field public static final int PEAP = 0; // 0x0
		field public static final int PWD = 3; // 0x3

+4 −1

Original line number	Diff line number	Diff line
		@@ -235,8 +235,10 @@ public class WifiEnterpriseConfig implements Parcelable {
		public static final int SIM = 4;
		/** EAP-Authentication and Key Agreement */
		public static final int AKA = 5;
		/** EAP-Authentication and Key Agreement Prime */
		public static final int AKA_PRIME = 6;
		/** @hide */
		public static final String[] strings = { "PEAP", "TLS", "TTLS", "PWD", "SIM", "AKA" };
		public static final String[] strings = { "PEAP", "TLS", "TTLS", "PWD", "SIM", "AKA", "AKA'" };

		/** Prevent initialization */
		private Eap() {}
		@@ -286,6 +288,7 @@ public class WifiEnterpriseConfig implements Parcelable {
		case Eap.TTLS:
		case Eap.SIM:
		case Eap.AKA:
		case Eap.AKA_PRIME:
		mFields.put(EAP_KEY, Eap.strings[eapMethod]);
		mFields.put(OPP_KEY_CACHING, "1");
		break;