Merge "Added Passpoint prefix to Passpoint related methods in WifiInfo" (1fc84caa) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -29945,6 +29945,8 @@ package android.net.wifi {
		method public int getLinkSpeed();
		method public String getMacAddress();
		method public int getNetworkId();
		method @Nullable public String getPasspointFqdn();
		method @Nullable public String getPasspointProviderFriendlyName();
		method public int getRssi();
		method @IntRange(from=0xffffffff) public int getRxLinkSpeedMbps();
		method public String getSSID();

+0 −2

Original line number	Diff line number	Diff line
		@@ -4734,8 +4734,6 @@ package android.net.wifi {
		}

		public class WifiInfo implements android.os.Parcelable {
		method @Nullable public String getFqdn();
		method @Nullable public String getProviderFriendlyName();
		method public boolean isOsuAp();
		method public boolean isPasspointAp();
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -1076,7 +1076,7 @@ public class AccessPoint implements Comparable<AccessPoint> {
		return (info.isOsuAp() && mOsuStatus != null);
		} else if (info.isPasspointAp() \|\| isPasspoint()) {
		return (info.isPasspointAp() && isPasspoint()
		&& TextUtils.equals(info.getFqdn(), mConfig.FQDN));
		&& TextUtils.equals(info.getPasspointFqdn(), mConfig.FQDN));
		}

		if (networkId != WifiConfiguration.INVALID_NETWORK_ID) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -118,7 +118,7 @@ public class WifiStatusTracker extends ConnectivityManager.NetworkCallback {
		mWifiInfo = mWifiManager.getConnectionInfo();
		if (mWifiInfo != null) {
		if (mWifiInfo.isPasspointAp() \|\| mWifiInfo.isOsuAp()) {
		ssid = mWifiInfo.getProviderFriendlyName();
		ssid = mWifiInfo.getPasspointProviderFriendlyName();
		} else {
		ssid = getValidSsid(mWifiInfo);
		}

+8 −6

Original line number	Diff line number	Diff line
		@@ -539,9 +539,10 @@ public class WifiInfo implements Parcelable {
		mFqdn = fqdn;
		}

		/** {@hide} */
		@SystemApi
		public @Nullable String getFqdn() {
		/**
		* Returns the Fully Qualified Domain Name of the network if it is a Passpoint network.
		*/
		public @Nullable String getPasspointFqdn() {
		return mFqdn;
		}

		@@ -550,9 +551,10 @@ public class WifiInfo implements Parcelable {
		mProviderFriendlyName = providerFriendlyName;
		}

		/** {@hide} */
		@SystemApi
		public @Nullable String getProviderFriendlyName() {
		/**
		* Returns the Provider Friendly Name of the network if it is a Passpoint network.
		*/
		public @Nullable String getPasspointProviderFriendlyName() {
		return mProviderFriendlyName;
		}