Implement EAP Session Configs for EAP-AKA'.

Bug: 142805103
Test: added EapSessionConfigTest.
Test: atest FrameworksIkeTests
Change-Id: I8f1c08df9feb4d4ac9c26494430e4315c543961a

1 files changed, 22 insertions, 1 deletions

diff --git a/tests/iketests/src/java/com/android/ike/eap/EapSessionConfigTest.java b/tests/iketests/src/java/com/android/ike/eap/EapSessionConfigTest.java
index 1591cbb6..112f464a 100644
--- a/tests/iketests/src/java/com/android/ike/eap/EapSessionConfigTest.java
+++ b/tests/iketests/src/java/com/android/ike/eap/EapSessionConfigTest.java
@@ -20,6 +20,7 @@ import static android.telephony.TelephonyManager.APPTYPE_USIM;
 
 import static com.android.ike.eap.EapSessionConfig.DEFAULT_IDENTITY;
 import static com.android.ike.eap.message.EapData.EAP_TYPE_AKA;
+import static com.android.ike.eap.message.EapData.EAP_TYPE_AKA_PRIME;
 import static com.android.ike.eap.message.EapData.EAP_TYPE_MSCHAP_V2;
 import static com.android.ike.eap.message.EapData.EAP_TYPE_SIM;
 
@@ -28,15 +29,20 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
 import com.android.ike.eap.EapSessionConfig.EapAkaConfig;
+import com.android.ike.eap.EapSessionConfig.EapAkaPrimeConfig;
 import com.android.ike.eap.EapSessionConfig.EapMethodConfig;
 import com.android.ike.eap.EapSessionConfig.EapMsChapV2Config;
 import com.android.ike.eap.EapSessionConfig.EapSimConfig;
 
 import org.junit.Test;
 
+import java.nio.charset.StandardCharsets;
+
 public class EapSessionConfigTest {
-    private static final byte[] EAP_IDENTITY = "test@android.net".getBytes();
+    private static final byte[] EAP_IDENTITY =
+            "test@android.net".getBytes(StandardCharsets.US_ASCII);
     private static final int SUB_ID = 1;
+    private static final String NETWORK_NAME = "android.net";
     private static final String USERNAME = "username";
     private static final String PASSWORD = "password";
 
@@ -70,6 +76,21 @@ public class EapSessionConfigTest {
     }
 
     @Test
+    public void testBuildEapAkaPrime() {
+        EapSessionConfig result =
+                new EapSessionConfig.Builder()
+                        .setEapAkaPrimeConfig(SUB_ID, APPTYPE_USIM, NETWORK_NAME)
+                        .build();
+
+        assertEquals(DEFAULT_IDENTITY, result.eapIdentity);
+        EapMethodConfig eapMethodConfig = result.eapConfigs.get(EAP_TYPE_AKA_PRIME);
+        EapAkaPrimeConfig eapAkaPrimeConfig = (EapAkaPrimeConfig) eapMethodConfig;
+        assertEquals(SUB_ID, eapAkaPrimeConfig.subId);
+        assertEquals(APPTYPE_USIM, eapAkaPrimeConfig.apptype);
+        assertEquals(NETWORK_NAME, eapAkaPrimeConfig.networkName);
+    }
+
+    @Test
     public void testBuildEapMsChapV2() {
         EapSessionConfig result =
                 new EapSessionConfig.Builder().setEapMsChapV2Config(USERNAME, PASSWORD).build();