Merge "wifi: add a flag indicating legacy Passpoint configuration" (2d87679a) · Commits · e / os / android_frameworks_base

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

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -433,6 +433,13 @@ public class WifiConfiguration implements Parcelable {
	*/		*/
	public int dtimInterval = 0;		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		* @hide
	* Uid of app creating the configuration		* Uid of app creating the configuration
	@@ -1951,6 +1958,7 @@ public class WifiConfiguration implements Parcelable {
	mCachedConfigKey = null; //force null configKey		mCachedConfigKey = null; //force null configKey
	selfAdded = source.selfAdded;		selfAdded = source.selfAdded;
	validatedInternetAccess = source.validatedInternetAccess;		validatedInternetAccess = source.validatedInternetAccess;
			isLegacyPasspointConfig = source.isLegacyPasspointConfig;
	ephemeral = source.ephemeral;		ephemeral = source.ephemeral;
	meteredHint = source.meteredHint;		meteredHint = source.meteredHint;
	meteredOverride = source.meteredOverride;		meteredOverride = source.meteredOverride;
	@@ -2027,6 +2035,7 @@ public class WifiConfiguration implements Parcelable {
	dest.writeInt(selfAdded ? 1 : 0);		dest.writeInt(selfAdded ? 1 : 0);
	dest.writeInt(didSelfAdd ? 1 : 0);		dest.writeInt(didSelfAdd ? 1 : 0);
	dest.writeInt(validatedInternetAccess ? 1 : 0);		dest.writeInt(validatedInternetAccess ? 1 : 0);
			dest.writeInt(isLegacyPasspointConfig ? 1 : 0);
	dest.writeInt(ephemeral ? 1 : 0);		dest.writeInt(ephemeral ? 1 : 0);
	dest.writeInt(meteredHint ? 1 : 0);		dest.writeInt(meteredHint ? 1 : 0);
	dest.writeInt(meteredOverride ? 1 : 0);		dest.writeInt(meteredOverride ? 1 : 0);
	@@ -2093,6 +2102,7 @@ public class WifiConfiguration implements Parcelable {
	config.selfAdded = in.readInt() != 0;		config.selfAdded = in.readInt() != 0;
	config.didSelfAdd = in.readInt() != 0;		config.didSelfAdd = in.readInt() != 0;
	config.validatedInternetAccess = in.readInt() != 0;		config.validatedInternetAccess = in.readInt() != 0;
			config.isLegacyPasspointConfig = in.readInt() != 0;
	config.ephemeral = in.readInt() != 0;		config.ephemeral = in.readInt() != 0;
	config.meteredHint = in.readInt() != 0;		config.meteredHint = in.readInt() != 0;
	config.meteredOverride = in.readInt() != 0;		config.meteredOverride = in.readInt() != 0;