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

Merge "Add meteredHint to WifiConfiguration." into nyc-dev

Browse Source
This commit is contained in:
Jeremy Joslin
2016-03-24 17:27:52 +00:00
committed by Android (Google) Code Review
parent 4bbbeaa68b f0c9b8c68f
commit 52f0ea56db
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -682,6 +682,13 @@ public class WifiConfiguration implements Parcelable {
*/ */
public boolean ephemeral; public boolean ephemeral;
/**
* @hide
* A hint about whether or not the network represented by this WifiConfiguration
* is metered.
*/
public boolean meteredHint;
/** /**
* @hide * @hide
* Number of time the scorer overrode a the priority based choice, when comparing two * Number of time the scorer overrode a the priority based choice, when comparing two
@@ -1302,6 +1309,7 @@ public class WifiConfiguration implements Parcelable {
selfAdded = false; selfAdded = false;
didSelfAdd = false; didSelfAdd = false;
ephemeral = false; ephemeral = false;
meteredHint = false;
validatedInternetAccess = false; validatedInternetAccess = false;
mIpConfiguration = new IpConfiguration(); mIpConfiguration = new IpConfiguration();
lastUpdateUid = -1; lastUpdateUid = -1;
@@ -1399,7 +1407,9 @@ public class WifiConfiguration implements Parcelable {
if (this.selfAdded) sbuf.append(" selfAdded"); if (this.selfAdded) sbuf.append(" selfAdded");
if (this.validatedInternetAccess) sbuf.append(" validatedInternetAccess"); if (this.validatedInternetAccess) sbuf.append(" validatedInternetAccess");
if (this.ephemeral) sbuf.append(" ephemeral"); if (this.ephemeral) sbuf.append(" ephemeral");
if (this.didSelfAdd || this.selfAdded || this.validatedInternetAccess || this.ephemeral) { if (this.meteredHint) sbuf.append(" meteredHint");
if (this.didSelfAdd || this.selfAdded || this.validatedInternetAccess
|| this.ephemeral || this.meteredHint) {
sbuf.append("\n"); sbuf.append("\n");
} }
sbuf.append(" KeyMgmt:"); sbuf.append(" KeyMgmt:");
@@ -1832,6 +1842,7 @@ public class WifiConfiguration implements Parcelable {
selfAdded = source.selfAdded; selfAdded = source.selfAdded;
validatedInternetAccess = source.validatedInternetAccess; validatedInternetAccess = source.validatedInternetAccess;
ephemeral = source.ephemeral; ephemeral = source.ephemeral;
meteredHint = source.meteredHint;
if (source.visibility != null) { if (source.visibility != null) {
visibility = new Visibility(source.visibility); visibility = new Visibility(source.visibility);
} }
@@ -1916,6 +1927,7 @@ public class WifiConfiguration implements Parcelable {
dest.writeInt(didSelfAdd ? 1 : 0); dest.writeInt(didSelfAdd ? 1 : 0);
dest.writeInt(validatedInternetAccess ? 1 : 0); dest.writeInt(validatedInternetAccess ? 1 : 0);
dest.writeInt(ephemeral ? 1 : 0); dest.writeInt(ephemeral ? 1 : 0);
dest.writeInt(meteredHint ? 1 : 0);
dest.writeInt(creatorUid); dest.writeInt(creatorUid);
dest.writeInt(lastConnectUid); dest.writeInt(lastConnectUid);
dest.writeInt(lastUpdateUid); dest.writeInt(lastUpdateUid);
@@ -1985,6 +1997,7 @@ public class WifiConfiguration implements Parcelable {
config.didSelfAdd = in.readInt() != 0; config.didSelfAdd = in.readInt() != 0;
config.validatedInternetAccess = in.readInt() != 0; config.validatedInternetAccess = in.readInt() != 0;
config.ephemeral = in.readInt() != 0; config.ephemeral = in.readInt() != 0;
config.meteredHint = in.readInt() != 0;
config.creatorUid = in.readInt(); config.creatorUid = in.readInt();
config.lastConnectUid = in.readInt(); config.lastConnectUid = in.readInt();
config.lastUpdateUid = in.readInt(); config.lastUpdateUid = in.readInt();