commit adf9e95ecc5d0867adf1dc2d7adcac958457b98e
author Jean-Michel Bachot <jean-michel.bachot@intel.com> Thu Dec 11 20:04:20 2014 +0100
committer Vinit Deshpande <vinitd@google.com> Wed Mar 25 15:38:28 2015 -0700
tree 42bd63210f10d9d7f8916dbe8ce6ce81e133a44e
parent e5334732bc63c2d29a7f68b59b417286277b54f1

EAP-AKA' : Add support of EAP-AKA' in WiFi Enterprise methods

EAP-AKA' is a new hidden method

Change-Id: Ic103b25ad58807eebd5e0f8eefe3bfc02397aedc
Signed-off-by: Jean-Michel Bachot <jean-michel.bachot@intel.com>
Signed-off-by: Abdelmajid MLAYEH <abdelmajidx.mlayeh@intel.com>

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 9884b1d..98b15c7 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -18058,6 +18058,7 @@
 
   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

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 9948996..6838ec1 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -19568,6 +19568,7 @@
 
   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

wifi/java/android/net/wifi/WifiEnterpriseConfig.java

diff --git a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
index 36fc96b..440ad61 100644
--- a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
+++ b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
@@ -235,8 +235,10 @@
         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 @@
             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;