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-01-31 18:28:28 +00:00
committed by Android (Google) Code Review
parent b27aba9a92 1379fd0b1e
commit 6b1c99fefe
4 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -25572,6 +25572,7 @@ package android.net.wifi {
field public java.util.BitSet allowedProtocols;
field public android.net.wifi.WifiEnterpriseConfig enterpriseConfig;
field public boolean hiddenSSID;
field public boolean isHomeProviderNetwork;
field public int networkId;
field public java.lang.String preSharedKey;
field public int priority;

1
api/system-current.txt
View File

@@ -28061,6 +28061,7 @@ package android.net.wifi {
field public int creatorUid;
field public android.net.wifi.WifiEnterpriseConfig enterpriseConfig;
field public boolean hiddenSSID;
field public boolean isHomeProviderNetwork;
field public java.lang.String lastUpdateName;
field public int lastUpdateUid;
field public boolean meteredHint;

1
api/test-current.txt
View File

@@ -25664,6 +25664,7 @@ package android.net.wifi {
field public java.util.BitSet allowedProtocols;
field public android.net.wifi.WifiEnterpriseConfig enterpriseConfig;
field public boolean hiddenSSID;
field public boolean isHomeProviderNetwork;
field public int networkId;
field public java.lang.String preSharedKey;
field public int priority;

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
@@ -1891,6 +1897,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());
@@ -1971,6 +1978,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);
@@ -2036,6 +2044,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++) {