diff options
author | Yuhao Zheng <yuhaozheng@google.com> | 2014-05-27 10:35:02 -0700 |
---|---|---|
committer | Yuhao Zheng <yuhaozheng@google.com> | 2014-05-29 16:18:36 -0700 |
commit | 8a9eb81df1218884bf0c4cdb214d2f1ec0a5679c (patch) | |
tree | 89c99d284c824ff7e2e14ae98e20918d60ebb316 /wifi/java/android | |
parent | bc132a068b47994dc3f8e3c75c963f4676c2e970 (diff) | |
download | frameworks_base-8a9eb81df1218884bf0c4cdb214d2f1ec0a5679c.zip frameworks_base-8a9eb81df1218884bf0c4cdb214d2f1ec0a5679c.tar.gz frameworks_base-8a9eb81df1218884bf0c4cdb214d2f1ec0a5679c.tar.bz2 |
Wifi Passpoint API change
- hide package android.net.wifi.passpoint
- extend android.net.wifi APIs for Passpoint credential management
> hide for preview
Bug: 15191967
Change-Id: Ic90818cf5c91e93dd7890774543e08b842edc594
Diffstat (limited to 'wifi/java/android')
3 files changed, 24 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index 1157de7..963117c 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -216,6 +216,18 @@ public class WifiConfiguration implements Parcelable { * <code>XX:XX:XX:XX:XX:XX</code> where each <code>X</code> is a hex digit. */ public String BSSID; + /** + * Fully qualified domain name (FQDN), for Passpoint credential. + * e.g. {@code "mail.example.com"}. + * @hide + */ + public String FQDN; + /** + * Network access identifier (NAI) realm, for Passpoint credential. + * e.g. {@code "myhost.example.com"}. + * @hide + */ + public String naiRealm; /** * Pre-shared key for use with WPA-PSK. @@ -484,6 +496,8 @@ public class WifiConfiguration implements Parcelable { networkId = INVALID_NETWORK_ID; SSID = null; BSSID = null; + FQDN = null; + naiRealm = null; priority = 0; hiddenSSID = false; disableReason = DISABLED_UNKNOWN_REASON; @@ -565,7 +579,8 @@ public class WifiConfiguration implements Parcelable { sbuf.append("- DSBLE: ").append(this.disableReason).append(" "); } sbuf.append("ID: ").append(this.networkId).append(" SSID: ").append(this.SSID). - append(" BSSID: ").append(this.BSSID).append(" PRIO: ").append(this.priority). + append(" BSSID: ").append(this.BSSID).append(" FQDN: ").append(this.FQDN). + append(" REALM: ").append(this.naiRealm).append(" PRIO: ").append(this.priority). append('\n'); sbuf.append(" KeyMgmt:"); for (int k = 0; k < this.allowedKeyManagement.size(); k++) { @@ -870,6 +885,8 @@ public class WifiConfiguration implements Parcelable { disableReason = source.disableReason; SSID = source.SSID; BSSID = source.BSSID; + FQDN = source.FQDN; + naiRealm = source.naiRealm; preSharedKey = source.preSharedKey; wepKeys = new String[4]; @@ -932,6 +949,8 @@ public class WifiConfiguration implements Parcelable { dest.writeInt(disableReason); dest.writeString(SSID); dest.writeString(BSSID); + dest.writeString(FQDN); + dest.writeString(naiRealm); dest.writeString(preSharedKey); for (String wepKey : wepKeys) { dest.writeString(wepKey); @@ -976,6 +995,8 @@ public class WifiConfiguration implements Parcelable { config.disableReason = in.readInt(); config.SSID = in.readString(); config.BSSID = in.readString(); + config.FQDN = in.readString(); + config.naiRealm = in.readString(); config.preSharedKey = in.readString(); for (int i = 0; i < config.wepKeys.length; i++) { config.wepKeys[i] = in.readString(); diff --git a/wifi/java/android/net/wifi/passpoint/WifiPasspointCredential.java b/wifi/java/android/net/wifi/passpoint/WifiPasspointCredential.java index 090ac56..f809abf 100644 --- a/wifi/java/android/net/wifi/passpoint/WifiPasspointCredential.java +++ b/wifi/java/android/net/wifi/passpoint/WifiPasspointCredential.java @@ -27,6 +27,7 @@ import java.util.Map; /** * A class representing a Wi-Fi Passpoint credential. + * @hide */ public class WifiPasspointCredential implements Parcelable { diff --git a/wifi/java/android/net/wifi/passpoint/WifiPasspointManager.java b/wifi/java/android/net/wifi/passpoint/WifiPasspointManager.java index ebaa8c9..55acbad 100644 --- a/wifi/java/android/net/wifi/passpoint/WifiPasspointManager.java +++ b/wifi/java/android/net/wifi/passpoint/WifiPasspointManager.java @@ -35,6 +35,7 @@ import java.util.List; /** * Provides APIs for managing Wifi Passpoint credentials. + * @hide */ public class WifiPasspointManager { |