Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1379fd0b authored by Peter Qiu's avatar Peter Qiu
Browse files

wifi: WifiConfiguration: add isHomeProviderNetwork field 

This is a boolean field indicating if the given WiFi network is provided
by a Passpont home provider. This is useful for the Passpoint provisioning
app to determine if the current WiFi connection is allowed to perform
Passpoint subscription or policy updates when it needs to.

This field will be set by PasspointNetworkEvaluator when generating
a WifiConfiguration for a Passpoint network.

Bug: 34467212
Test: make update-api; make -j32
Change-Id: I47310cda078cbf1f2d1b0a9bf79f487230fb668f
parent 1eb7161f

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -25167,6 +25167,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;

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -27557,6 +27557,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;

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -25257,6 +25257,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;

wifi/java/android/net/wifi/WifiConfiguration.java

+9 −0
Original line number Diff line number Diff line
@@ -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++) {