Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow EAP-SIM authentication methods under PEAP"

Browse Source 
am: e690e0178c

Change-Id: I3f61bdd86c97210acd14b6d2d30e44e26c8b1085
This commit is contained in:
Paul Stewart
2017-02-11 02:43:38 +00:00
committed by android-build-merger
parent 3b9c0fadda e690e0178c
commit 549c3fc0da
5 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/current.txt
View File

@@ -24737,11 +24737,14 @@ package android.net.wifi {
} }
public static final class WifiEnterpriseConfig.Phase2 { public static final class WifiEnterpriseConfig.Phase2 {
field public static final int AKA = 6; // 0x6
field public static final int AKA_PRIME = 7; // 0x7
field public static final int GTC = 4; // 0x4 field public static final int GTC = 4; // 0x4
field public static final int MSCHAP = 2; // 0x2 field public static final int MSCHAP = 2; // 0x2
field public static final int MSCHAPV2 = 3; // 0x3 field public static final int MSCHAPV2 = 3; // 0x3
field public static final int NONE = 0; // 0x0 field public static final int NONE = 0; // 0x0
field public static final int PAP = 1; // 0x1 field public static final int PAP = 1; // 0x1
field public static final int SIM = 5; // 0x5
} }
public class WifiInfo implements android.os.Parcelable { public class WifiInfo implements android.os.Parcelable {

3
api/system-current.txt
View File

@@ -27110,11 +27110,14 @@ package android.net.wifi {
} }
public static final class WifiEnterpriseConfig.Phase2 { public static final class WifiEnterpriseConfig.Phase2 {
field public static final int AKA = 6; // 0x6
field public static final int AKA_PRIME = 7; // 0x7
field public static final int GTC = 4; // 0x4 field public static final int GTC = 4; // 0x4
field public static final int MSCHAP = 2; // 0x2 field public static final int MSCHAP = 2; // 0x2
field public static final int MSCHAPV2 = 3; // 0x3 field public static final int MSCHAPV2 = 3; // 0x3
field public static final int NONE = 0; // 0x0 field public static final int NONE = 0; // 0x0
field public static final int PAP = 1; // 0x1 field public static final int PAP = 1; // 0x1
field public static final int SIM = 5; // 0x5
} }
public class WifiInfo implements android.os.Parcelable { public class WifiInfo implements android.os.Parcelable {

3
api/test-current.txt
View File

@@ -24810,11 +24810,14 @@ package android.net.wifi {
} }
public static final class WifiEnterpriseConfig.Phase2 { public static final class WifiEnterpriseConfig.Phase2 {
field public static final int AKA = 6; // 0x6
field public static final int AKA_PRIME = 7; // 0x7
field public static final int GTC = 4; // 0x4 field public static final int GTC = 4; // 0x4
field public static final int MSCHAP = 2; // 0x2 field public static final int MSCHAP = 2; // 0x2
field public static final int MSCHAPV2 = 3; // 0x3 field public static final int MSCHAPV2 = 3; // 0x3
field public static final int NONE = 0; // 0x0 field public static final int NONE = 0; // 0x0
field public static final int PAP = 1; // 0x1 field public static final int PAP = 1; // 0x1
field public static final int SIM = 5; // 0x5
} }
public class WifiInfo implements android.os.Parcelable { public class WifiInfo implements android.os.Parcelable {

11
wifi/java/android/net/wifi/WifiEnterpriseConfig.java
View File

@@ -263,11 +263,17 @@ public class WifiEnterpriseConfig implements Parcelable {
public static final int MSCHAPV2 = 3; public static final int MSCHAPV2 = 3;
/** Generic Token Card */ /** Generic Token Card */
public static final int GTC = 4; public static final int GTC = 4;
/** EAP-Subscriber Identity Module */
public static final int SIM = 5;
/** EAP-Authentication and Key Agreement */
public static final int AKA = 6;
/** EAP-Authentication and Key Agreement Prime */
public static final int AKA_PRIME = 7;
private static final String AUTH_PREFIX = "auth="; private static final String AUTH_PREFIX = "auth=";
private static final String AUTHEAP_PREFIX = "autheap="; private static final String AUTHEAP_PREFIX = "autheap=";
/** @hide */ /** @hide */
public static final String[] strings = {EMPTY_VALUE, "PAP", "MSCHAP", public static final String[] strings = {EMPTY_VALUE, "PAP", "MSCHAP",
"MSCHAPV2", "GTC" }; "MSCHAPV2", "GTC", "SIM", "AKA", "AKA'" };
/** Prevent initialization */ /** Prevent initialization */
private Phase2() {} private Phase2() {}
@@ -426,6 +432,9 @@ public class WifiEnterpriseConfig implements Parcelable {
case Phase2.MSCHAP: case Phase2.MSCHAP:
case Phase2.MSCHAPV2: case Phase2.MSCHAPV2:
case Phase2.GTC: case Phase2.GTC:
case Phase2.SIM:
case Phase2.AKA:
case Phase2.AKA_PRIME:
mPhase2Method = phase2Method; mPhase2Method = phase2Method;
break; break;
default: default:

15
wifi/tests/src/android/net/wifi/WifiEnterpriseConfigTest.java
View File

@@ -283,6 +283,21 @@ public class WifiEnterpriseConfigTest {
assertEquals("\"auth=GTC\"", getSupplicantPhase2Method()); assertEquals("\"auth=GTC\"", getSupplicantPhase2Method());
} }
/** Verfies PEAP/SIM, PEAP/AKA, PEAP/AKA'. */
@Test
public void peapSimAkaAkaPrime() {
mEnterpriseConfig.setEapMethod(Eap.PEAP);
mEnterpriseConfig.setPhase2Method(Phase2.SIM);
assertEquals("PEAP", getSupplicantEapMethod());
assertEquals("\"auth=SIM\"", getSupplicantPhase2Method());
mEnterpriseConfig.setPhase2Method(Phase2.AKA);
assertEquals("\"auth=AKA\"", getSupplicantPhase2Method());
mEnterpriseConfig.setPhase2Method(Phase2.AKA_PRIME);
assertEquals("\"auth=AKA'\"", getSupplicantPhase2Method());
}
/** Verfies that the copy constructor preseves the inner method information. */ /** Verfies that the copy constructor preseves the inner method information. */
@Test @Test
public void copyConstructor() { public void copyConstructor() {