From 580a1bdfbc6a8c4ca25e796af234711184c13871 Mon Sep 17 00:00:00 2001 From: Peter Qiu Date: Fri, 10 Mar 2017 13:56:33 -0800 Subject: [PATCH] wifi: add a flag indicating legacy Passpoint configuration Bug: 36101691 Test: make -j32 Change-Id: I42df3160be9b2b863fededc1641482e5a39084e5 --- wifi/java/android/net/wifi/WifiConfiguration.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index 6095c86250f10..99d4d1ee057d6 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -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 @@ -1951,6 +1958,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; @@ -2027,6 +2035,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); @@ -2093,6 +2102,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;