Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "wifi: update passpoint to Passpoint in comments" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-03-29 19:31:37 +00:00
committed by Android (Google) Code Review
parent 202dc5e18d 6bbc8955c1
commit 10180bb47b
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wifi/java/android/net/wifi/ScanResult.java
View File

@@ -336,12 +336,12 @@ public class ScanResult implements Parcelable {
/** /**
* Indicates venue name (such as 'San Francisco Airport') published by access point; only * 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; public CharSequence venueName;
/** /**
* Indicates passpoint operator name published by access point. * Indicates Passpoint operator name published by access point.
*/ */
public CharSequence operatorFriendlyName; public CharSequence operatorFriendlyName;

10
wifi/java/android/net/wifi/WifiConfiguration.java
View File

@@ -367,12 +367,12 @@ public class WifiConfiguration implements Parcelable {
public WifiEnterpriseConfig enterpriseConfig; public WifiEnterpriseConfig enterpriseConfig;
/** /**
* Fully qualified domain name of a passpoint configuration * Fully qualified domain name of a Passpoint configuration
*/ */
public String FQDN; public String FQDN;
/** /**
* Name of passpoint credential provider * Name of Passpoint credential provider
*/ */
public String providerFriendlyName; public String providerFriendlyName;
@@ -385,8 +385,8 @@ public class WifiConfiguration implements Parcelable {
public boolean isHomeProviderNetwork; public boolean isHomeProviderNetwork;
/** /**
* Roaming Consortium Id list for passpoint credential; identifies a set of networks where * Roaming Consortium Id list for Passpoint credential; identifies a set of networks where
* passpoint credential will be considered valid * Passpoint credential will be considered valid
*/ */
public long[] roamingConsortiumIds; 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() { public boolean isPasspoint() {
return !TextUtils.isEmpty(FQDN) return !TextUtils.isEmpty(FQDN)

10
wifi/java/android/net/wifi/WifiEnterpriseConfig.java
View File

@@ -940,8 +940,8 @@ public class WifiEnterpriseConfig implements Parcelable {
} }
/** /**
* Set realm for passpoint credential; realm identifies a set of networks where your * Set realm for Passpoint credential; realm identifies a set of networks where your
* passpoint credential can be used * Passpoint credential can be used
* @param realm the realm * @param realm the realm
*/ */
public void setRealm(String 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 * @return the realm
*/ */
public String getRealm() { 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) * @param plmn the plmn value derived from mcc (mobile country code) & mnc (mobile network code)
*/ */
public void setPlmn(String plmn) { 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 * (String)} for more information
* @return the plmn * @return the plmn
*/ */

4
wifi/java/android/net/wifi/WifiManager.java
View File

@@ -962,7 +962,7 @@ public class WifiManager {
* *
* An {@link IllegalArgumentException} will be thrown on failure. * 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) { public void removePasspointConfiguration(String fqdn) {
try { try {
@@ -1254,7 +1254,7 @@ public class WifiManager {
} }
/** /**
* @return true if this adapter supports passpoint * @return true if this adapter supports Passpoint
* @hide * @hide
*/ */
public boolean isPasspointSupported() { public boolean isPasspointSupported() {