Merge "Change Doc for getConnectionInfo" (cebccf30) · Commits · e / os / android_frameworks_base

wifi/java/android/net/wifi/WifiInfo.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -700,6 +700,11 @@ public class WifiInfo implements Parcelable {

		/**
		* Returns the Fully Qualified Domain Name of the network if it is a Passpoint network.
		* <p>
		* The FQDN may be
		* <lt>{@code null} if no network currently connected, currently connected network is not
		* passpoint network or the caller has insufficient permissions to access the FQDN.</lt>
		* </p>
		*/
		public @Nullable String getPasspointFqdn() {
		return mFqdn;
		@@ -712,6 +717,12 @@ public class WifiInfo implements Parcelable {

		/**
		* Returns the Provider Friendly Name of the network if it is a Passpoint network.
		* <p>
		* The Provider Friendly Name may be
		* <lt>{@code null} if no network currently connected, currently connected network is not
		* passpoint network or the caller has insufficient permissions to access the Provider Friendly
		* Name. </lt>
		* </p>
		*/
		public @Nullable String getPasspointProviderFriendlyName() {
		return mProviderFriendlyName;

+2 −0

Original line number	Diff line number	Diff line
		@@ -2606,6 +2606,8 @@ public class WifiManager {
		* the same permissions as {@link #getScanResults}. If such access is not allowed,
		* {@link WifiInfo#getSSID} will return {@link #UNKNOWN_SSID} and
		* {@link WifiInfo#getBSSID} will return {@code "02:00:00:00:00:00"}.
		* {@link WifiInfo#getPasspointFqdn()} will return null.
		* {@link WifiInfo#getPasspointProviderFriendlyName()} will return null.
		*
		* @return the Wi-Fi information, contained in {@link WifiInfo}.
		*/