Merge "wifi: update passpoint to Passpoint in comments" into oc-dev (10180bb4) · Commits · e / os / android_frameworks_base

wifi/java/android/net/wifi/ScanResult.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -336,12 +336,12 @@ public class ScanResult implements Parcelable {

		/**
		* Indicates venue name (such as 'San Francisco Airport') published by access point; only
		* available on passpoint network and if published by access point.
		* available on Passpoint network and if published by access point.
		*/
		public CharSequence venueName;

		/**
		* Indicates passpoint operator name published by access point.
		* Indicates Passpoint operator name published by access point.
		*/
		public CharSequence operatorFriendlyName;

+5 −5

Original line number	Diff line number	Diff line
		@@ -367,12 +367,12 @@ public class WifiConfiguration implements Parcelable {
		public WifiEnterpriseConfig enterpriseConfig;

		/**
		* Fully qualified domain name of a passpoint configuration
		* Fully qualified domain name of a Passpoint configuration
		*/
		public String FQDN;

		/**
		* Name of passpoint credential provider
		* Name of Passpoint credential provider
		*/
		public String providerFriendlyName;

		@@ -385,8 +385,8 @@ public class WifiConfiguration implements Parcelable {
		public boolean isHomeProviderNetwork;

		/**
		* Roaming Consortium Id list for passpoint credential; identifies a set of networks where
		* passpoint credential will be considered valid
		* Roaming Consortium Id list for Passpoint credential; identifies a set of networks where
		* Passpoint credential will be considered valid
		*/
		public long[] roamingConsortiumIds;

		@@ -1425,7 +1425,7 @@ public class WifiConfiguration implements Parcelable {
		}

		/**
		* Identify if this configuration represents a passpoint network
		* Identify if this configuration represents a Passpoint network
		*/
		public boolean isPasspoint() {
		return !TextUtils.isEmpty(FQDN)

+5 −5

Original line number	Diff line number	Diff line
		@@ -940,8 +940,8 @@ public class WifiEnterpriseConfig implements Parcelable {
		}

		/**
		* Set realm for passpoint credential; realm identifies a set of networks where your
		* passpoint credential can be used
		* Set realm for Passpoint credential; realm identifies a set of networks where your
		* Passpoint credential can be used
		* @param realm the realm
		*/
		public void setRealm(String realm) {
		@@ -949,7 +949,7 @@ public class WifiEnterpriseConfig implements Parcelable {
		}

		/**
		* Get realm for passpoint credential; see {@link #setRealm(String)} for more information
		* Get realm for Passpoint credential; see {@link #setRealm(String)} for more information
		* @return the realm
		*/
		public String getRealm() {
		@@ -957,7 +957,7 @@ public class WifiEnterpriseConfig implements Parcelable {
		}

		/**
		* Set plmn (Public Land Mobile Network) of the provider of passpoint credential
		* Set plmn (Public Land Mobile Network) of the provider of Passpoint credential
		* @param plmn the plmn value derived from mcc (mobile country code) & mnc (mobile network code)
		*/
		public void setPlmn(String plmn) {
		@@ -965,7 +965,7 @@ public class WifiEnterpriseConfig implements Parcelable {
		}

		/**
		* Get plmn (Public Land Mobile Network) for passpoint credential; see {@link #setPlmn
		* Get plmn (Public Land Mobile Network) for Passpoint credential; see {@link #setPlmn
		* (String)} for more information
		* @return the plmn
		*/

+2 −2

Original line number	Diff line number	Diff line
		@@ -962,7 +962,7 @@ public class WifiManager {
		*
		* An {@link IllegalArgumentException} will be thrown on failure.
		*
		* @param fqdn The FQDN of the passpoint configuration to be removed
		* @param fqdn The FQDN of the Passpoint configuration to be removed
		*/
		public void removePasspointConfiguration(String fqdn) {
		try {
		@@ -1254,7 +1254,7 @@ public class WifiManager {
		}

		/**
		* @return true if this adapter supports passpoint
		* @return true if this adapter supports Passpoint
		* @hide
		*/
		public boolean isPasspointSupported() {