From c8505931420dd9a76acf940a56b31354cd0105b0 Mon Sep 17 00:00:00 2001 From: Vinit Deshpande Date: Mon, 21 Jul 2014 16:18:04 -0700 Subject: [PATCH] Support EAP-SIM and EAP-AKA This change un-hides constants for these two methods and also un-hides RADIUS/AAA FQDN field to allow creating Passpoint release 1 credentials. Change-Id: Ia3501017dc1f5c0b4932bb45e1e9c5bf7262d7fe --- api/current.txt | 3 +++ wifi/java/android/net/wifi/WifiConfiguration.java | 3 +-- wifi/java/android/net/wifi/WifiEnterpriseConfig.java | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/api/current.txt b/api/current.txt index 87fd7df930759..b67e064332677 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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 } diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index 8e27e2a63a2ca..3c37b94695ad8 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -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; /** diff --git a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java index 7debb9390baff..1484d49905d35 100644 --- a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java +++ b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java @@ -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" };