diff --git a/api/current.txt b/api/current.txt index 45de3181cbabc..6810969642c2b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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; diff --git a/api/system-current.txt b/api/system-current.txt index bd3bf3ae35f8d..14229cf21484a 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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; diff --git a/api/test-current.txt b/api/test-current.txt index c96eac32076a8..f2460a9ccd196 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -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; diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index 8cf7a24efb0ad..dbf8cc1674b26 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -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++) {