diff options
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/WifiConfiguration.java | 9 |
4 files changed, 12 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 42275de65396..970435462b47 100644 --- a/api/current.txt +++ b/api/current.txt @@ -24629,6 +24629,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; diff --git a/api/system-current.txt b/api/system-current.txt index 6ebbee2f4e16..f99039bf707b 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -26979,6 +26979,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; diff --git a/api/test-current.txt b/api/test-current.txt index 40085a26ef5d..2f46e5eee714 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -24702,6 +24702,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; diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index 3a4567112704..00b258f13f5d 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -373,6 +373,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++) { |