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

am 70825f5c: Merge "Support EAP-SIM and EAP-AKA" into lmp-dev

Browse Source 
* commit '70825f5c3f1b4426984ca188f64d38db3be37b0e':
  Support EAP-SIM and EAP-AKA
This commit is contained in:
Vinit Deshpande
2014-08-10 20:27:23 +00:00
committed by Android Git Automerger
parent e3fcc87d2f 0b798b97dc
commit aa740e812d
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/current.txt
View File

@@ -18336,6 +18336,7 @@ package android.net.wifi {
method public int describeContents();
method public void writeToParcel(android.os.Parcel, int);
field public java.lang.String BSSID;
field public java.lang.String FQDN;
field public java.lang.String SSID;
field public java.util.BitSet allowedAuthAlgorithms;
field public java.util.BitSet allowedGroupCiphers;
@@ -18425,9 +18426,11 @@ package android.net.wifi {
}
public static final class WifiEnterpriseConfig.Eap {
field public static final int AKA = 5; // 0x5
field public static final int NONE = -1; // 0xffffffff
field public static final int PEAP = 0; // 0x0
field public static final int PWD = 3; // 0x3
field public static final int SIM = 4; // 0x4
field public static final int TLS = 1; // 0x1
field public static final int TTLS = 2; // 0x2
}

3
wifi/java/android/net/wifi/WifiConfiguration.java
View File

@@ -223,9 +223,8 @@ public class WifiConfiguration implements Parcelable {
*/
public String BSSID;
/**
* Fully qualified domain name (FQDN), for Passpoint credential.
* Fully qualified domain name (FQDN) of AAA server or RADIUS server
* e.g. {@code "mail.example.com"}.
* @hide
*/
public String FQDN;
/**

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

@@ -224,9 +224,9 @@ public class WifiEnterpriseConfig implements Parcelable {
public static final int TTLS = 2;
/** EAP-Password */
public static final int PWD = 3;
/** EAP-Subscriber Identity Module {@hide} */
/** EAP-Subscriber Identity Module */
public static final int SIM = 4;
/** EAP-Authentication and Key Agreement {@hide} */
/** EAP-Authentication and Key Agreement */
public static final int AKA = 5;
/** @hide */
public static final String[] strings = { "PEAP", "TLS", "TTLS", "PWD", "SIM", "AKA" };