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

Commit eeeb10c6 authored by Peter Qiu's avatar Peter Qiu Committed by android-build-merger
Browse files

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

am: 281fae21

Change-Id: I1baeb7afdff6fbc399ab16ef7aa266506ef7aacb
parents 5a389e7e 281fae21

api/current.txt

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

api/system-current.txt

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

api/test-current.txt

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

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

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