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

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

Merge "wifi: add a flag indicating legacy Passpoint configuration" am: 2d87679a 

am: 1228b6cd

Change-Id: Ifc293108dfdfb503ab7596da657e9768a8fea25d
parents 8ade2761 1228b6cd

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

+10 −0
Original line number Diff line number Diff line
@@ -433,6 +433,13 @@ public class WifiConfiguration implements Parcelable { 
     */

    public int dtimInterval = 0;



    /**

     * Flag indicating if this configuration represents a legacy Passpoint configuration

     * (Release N or older).  This is used for migrating Passpoint configuration from N to O.

     * This will no longer be needed after O.

     * @hide

     */

    public boolean isLegacyPasspointConfig = false;

    /**

     * @hide

     * Uid of app creating the configuration
@@ -1958,6 +1965,7 @@ public class WifiConfiguration implements Parcelable { 
            mCachedConfigKey = null; //force null configKey

            selfAdded = source.selfAdded;

            validatedInternetAccess = source.validatedInternetAccess;

            isLegacyPasspointConfig = source.isLegacyPasspointConfig;

            ephemeral = source.ephemeral;

            meteredHint = source.meteredHint;

            meteredOverride = source.meteredOverride;
@@ -2035,6 +2043,7 @@ public class WifiConfiguration implements Parcelable { 
        dest.writeInt(selfAdded ? 1 : 0);

        dest.writeInt(didSelfAdd ? 1 : 0);

        dest.writeInt(validatedInternetAccess ? 1 : 0);

        dest.writeInt(isLegacyPasspointConfig ? 1 : 0);

        dest.writeInt(ephemeral ? 1 : 0);

        dest.writeInt(meteredHint ? 1 : 0);

        dest.writeInt(meteredOverride ? 1 : 0);
@@ -2102,6 +2111,7 @@ public class WifiConfiguration implements Parcelable { 
                config.selfAdded = in.readInt() != 0;

                config.didSelfAdd = in.readInt() != 0;

                config.validatedInternetAccess = in.readInt() != 0;

                config.isLegacyPasspointConfig = in.readInt() != 0;

                config.ephemeral = in.readInt() != 0;

                config.meteredHint = in.readInt() != 0;

                config.meteredOverride = in.readInt() != 0;