diff options
| author | Vinit Deshpande <vinitd@google.com> | 2014-07-21 16:18:04 -0700 |
|---|---|---|
| committer | Vinit Deshpande <vinitd@google.com> | 2014-08-08 21:06:12 -0700 |
| commit | c8505931420dd9a76acf940a56b31354cd0105b0 (patch) | |
| tree | 8cef899f03a31ebafc66ba6c1e58f0d9b66a5cd9 /wifi | |
| parent | ec64709ce042bcf456f9749e079e5f6981cfbbb9 (diff) | |
| download | frameworks_base-c8505931420dd9a76acf940a56b31354cd0105b0.zip frameworks_base-c8505931420dd9a76acf940a56b31354cd0105b0.tar.gz frameworks_base-c8505931420dd9a76acf940a56b31354cd0105b0.tar.bz2 | |
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
Diffstat (limited to 'wifi')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiConfiguration.java | 3 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/WifiEnterpriseConfig.java | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index 8e27e2a..3c37b94 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 7debb93..1484d49 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" }; |