drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "wifi: WifiConfiguration: add isHomeProviderNetwork field"

Browse Source
This commit is contained in:
Treehugger Robot
2017-02-02 19:29:51 +00:00
committed by Gerrit Code Review
parent ba9bbd8517 04959d48e1
commit e724f82b3d
4 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -372,6 +372,12 @@ public class WifiConfiguration implements Parcelable {
*/
public String providerFriendlyName;
/**
* Flag indicating if this network is provided by a home Passpoint provider or a roaming
* Passpoint provider.
*/
public boolean isHomeProviderNetwork;
/**
* Roaming Consortium Id list for passpoint credential; identifies a set of networks where
* passpoint credential will be considered valid
@ -1881,6 +1887,7 @@ public class WifiConfiguration implements Parcelable {
FQDN = source.FQDN;
roamingConsortiumIds = source.roamingConsortiumIds.clone();
providerFriendlyName = source.providerFriendlyName;
isHomeProviderNetwork = source.isHomeProviderNetwork;
preSharedKey = source.preSharedKey;
mNetworkSelectionStatus.copy(source.getNetworkSelectionStatus());
@ -1961,6 +1968,7 @@ public class WifiConfiguration implements Parcelable {
dest.writeInt(apChannel);
dest.writeString(FQDN);
dest.writeString(providerFriendlyName);
dest.writeInt(isHomeProviderNetwork ? 1 : 0);
dest.writeInt(roamingConsortiumIds.length);
for (long roamingConsortiumId : roamingConsortiumIds) {
dest.writeLong(roamingConsortiumId);
@ -2026,6 +2034,7 @@ public class WifiConfiguration implements Parcelable {
config.apChannel = in.readInt();
config.FQDN = in.readString();
config.providerFriendlyName = in.readString();
config.isHomeProviderNetwork = in.readInt() != 0;
int numRoamingConsortiumIds = in.readInt();
config.roamingConsortiumIds = new long[numRoamingConsortiumIds];
for (int i = 0; i < numRoamingConsortiumIds; i++) {