Merge "DO NOT MERGE - Wifi Passpoint API change" into lmp-preview-dev (8407968d) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −24

Original line number	Diff line number	Diff line
		@@ -7036,7 +7036,6 @@ package android.content {
		field public static final java.lang.String VIBRATOR_SERVICE = "vibrator";
		field public static final java.lang.String WALLPAPER_SERVICE = "wallpaper";
		field public static final java.lang.String WIFI_P2P_SERVICE = "wifip2p";
		field public static final java.lang.String WIFI_PASSPOINT_SERVICE = "wifipasspoint";
		field public static final java.lang.String WIFI_SERVICE = "wifi";
		field public static final java.lang.String WINDOW_SERVICE = "window";
		}
		@@ -17468,29 +17467,6 @@ package android.net.wifi.p2p.nsd {

		}

		package android.net.wifi.passpoint {

		public class WifiPasspointCredential implements android.os.Parcelable {
		ctor public WifiPasspointCredential(java.lang.String, android.net.wifi.WifiEnterpriseConfig);
		method public int describeContents();
		method public java.lang.String getClientCertPath();
		method public int getEapMethod();
		method public java.lang.String getFqdn();
		method public java.lang.String getImsi();
		method public java.lang.String getRealm();
		method public java.lang.String getUserName();
		method public void writeToParcel(android.os.Parcel, int);
		}

		public class WifiPasspointManager {
		method public boolean addCredential(android.net.wifi.passpoint.WifiPasspointCredential);
		method public java.util.List<android.net.wifi.passpoint.WifiPasspointCredential> getSavedCredentials();
		method public boolean removeCredential(android.net.wifi.passpoint.WifiPasspointCredential);
		method public boolean updateCredential(android.net.wifi.passpoint.WifiPasspointCredential);
		}

		}

		package android.nfc {

		public class FormatException extends java.lang.Exception {

core/java/android/content/Context.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -2363,6 +2363,7 @@ public abstract class Context {
		*
		* @see #getSystemService
		* @see android.net.wifi.passpoint.WifiPasspointManager
		* @hide
		*/
		public static final String WIFI_PASSPOINT_SERVICE = "wifipasspoint";

wifi/java/android/net/wifi/WifiConfiguration.java

+22 −1

Original line number	Diff line number	Diff line
		@@ -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();

wifi/java/android/net/wifi/passpoint/WifiPasspointCredential.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,10 @@ import java.util.Set;
		import java.util.Iterator;
		import java.util.Map;

		/**
		* A class representing a Wi-Fi Passpoint credential.
		* @hide
		*/
		public class WifiPasspointCredential implements Parcelable {

		private final static String TAG = "PasspointCredential";

wifi/java/android/net/wifi/passpoint/WifiPasspointManager.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ import java.util.List;

		/**
		* Provides APIs for managing Wifi Passpoint credentials.
		* @hide
		*/
		public class WifiPasspointManager {