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

Merge "wifi: WifiConfiguration: add isHomeProviderNetwork field" am: e724f82b3d

Browse Source 
am: 281fae21f8

Change-Id: I1baeb7afdff6fbc399ab16ef7aa266506ef7aacb
This commit is contained in:
Peter Qiu
2017-02-02 19:42:51 +00:00
committed by android-build-merger
parent 5a389e7e44 281fae21f8
commit eeeb10c645
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

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

1
api/system-current.txt
View File

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

1
api/test-current.txt
View File

@@ -24703,6 +24703,7 @@ package android.net.wifi {
field public java.util.BitSet allowedProtocols; field public java.util.BitSet allowedProtocols;
field public android.net.wifi.WifiEnterpriseConfig enterpriseConfig; field public android.net.wifi.WifiEnterpriseConfig enterpriseConfig;
field public boolean hiddenSSID; field public boolean hiddenSSID;
field public boolean isHomeProviderNetwork;
field public int networkId; field public int networkId;
field public java.lang.String preSharedKey; field public java.lang.String preSharedKey;
field public int priority; 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; 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 * 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
@@ -1881,6 +1887,7 @@ public class WifiConfiguration implements Parcelable {
FQDN = source.FQDN; FQDN = source.FQDN;
roamingConsortiumIds = source.roamingConsortiumIds.clone(); roamingConsortiumIds = source.roamingConsortiumIds.clone();
providerFriendlyName = source.providerFriendlyName; providerFriendlyName = source.providerFriendlyName;
isHomeProviderNetwork = source.isHomeProviderNetwork;
preSharedKey = source.preSharedKey; preSharedKey = source.preSharedKey;
mNetworkSelectionStatus.copy(source.getNetworkSelectionStatus()); mNetworkSelectionStatus.copy(source.getNetworkSelectionStatus());
@@ -1961,6 +1968,7 @@ public class WifiConfiguration implements Parcelable {
dest.writeInt(apChannel); dest.writeInt(apChannel);
dest.writeString(FQDN); dest.writeString(FQDN);
dest.writeString(providerFriendlyName); dest.writeString(providerFriendlyName);
dest.writeInt(isHomeProviderNetwork ? 1 : 0);
dest.writeInt(roamingConsortiumIds.length); dest.writeInt(roamingConsortiumIds.length);
for (long roamingConsortiumId : roamingConsortiumIds) { for (long roamingConsortiumId : roamingConsortiumIds) {
dest.writeLong(roamingConsortiumId); dest.writeLong(roamingConsortiumId);
@@ -2026,6 +2034,7 @@ public class WifiConfiguration implements Parcelable {
config.apChannel = in.readInt(); config.apChannel = in.readInt();
config.FQDN = in.readString(); config.FQDN = in.readString();
config.providerFriendlyName = in.readString(); config.providerFriendlyName = in.readString();
config.isHomeProviderNetwork = in.readInt() != 0;
int numRoamingConsortiumIds = in.readInt(); int numRoamingConsortiumIds = in.readInt();
config.roamingConsortiumIds = new long[numRoamingConsortiumIds]; config.roamingConsortiumIds = new long[numRoamingConsortiumIds];
for (int i = 0; i < numRoamingConsortiumIds; i++) { for (int i = 0; i < numRoamingConsortiumIds; i++) {