Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "wifi: add a flag indicating legacy Passpoint configuration" am: 2d87679a11 am: 1228b6cdec" into nyc-mr2-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2017-03-16 23:41:29 +00:00
committed by Android (Google) Code Review
parent d4e88e2642 5b6543f2c0
commit 01213393fb
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wifi/java/android/net/wifi/WifiConfiguration.java
View File

@@ -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;