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

am f2a598e4: am 074c5b5b: Merge "Don\'t drop WifiConfiguration\'s ephemeral bit on copy/parcel." into lmp-mr1-dev

Browse Source 
* commit 'f2a598e445800c9209dc58ab0005ca466eb14679':
  Don't drop WifiConfiguration's ephemeral bit on copy/parcel.
This commit is contained in:
Jeff Davidson
2014-10-15 15:58:47 +00:00
committed by Android Git Automerger
parent 8fa418cd87 f2a598e445
commit 1199a4c436
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -977,7 +977,8 @@ public class WifiConfiguration implements Parcelable {
if (this.didSelfAdd) sbuf.append(" didSelfAdd"); if (this.didSelfAdd) sbuf.append(" didSelfAdd");
if (this.selfAdded) sbuf.append(" selfAdded"); if (this.selfAdded) sbuf.append(" selfAdded");
if (this.noInternetAccess) sbuf.append(" noInternetAccess"); if (this.noInternetAccess) sbuf.append(" noInternetAccess");
if (this.didSelfAdd || this.selfAdded || this.noInternetAccess) { if (this.ephemeral) sbuf.append(" ephemeral");
if (this.didSelfAdd || this.selfAdded || this.noInternetAccess || this.ephemeral) {
sbuf.append("\n"); sbuf.append("\n");
} }
sbuf.append(" KeyMgmt:"); sbuf.append(" KeyMgmt:");
@@ -1434,6 +1435,7 @@ public class WifiConfiguration implements Parcelable {
autoJoinStatus = source.autoJoinStatus; autoJoinStatus = source.autoJoinStatus;
selfAdded = source.selfAdded; selfAdded = source.selfAdded;
noInternetAccess = source.noInternetAccess; noInternetAccess = source.noInternetAccess;
ephemeral = source.ephemeral;
if (source.visibility != null) { if (source.visibility != null) {
visibility = new Visibility(source.visibility); visibility = new Visibility(source.visibility);
} }
@@ -1510,6 +1512,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(noInternetAccess ? 1 : 0); dest.writeInt(noInternetAccess ? 1 : 0);
dest.writeInt(ephemeral ? 1 : 0);
dest.writeInt(creatorUid); dest.writeInt(creatorUid);
dest.writeInt(lastConnectUid); dest.writeInt(lastConnectUid);
dest.writeInt(lastUpdateUid); dest.writeInt(lastUpdateUid);
@@ -1570,6 +1573,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.noInternetAccess = in.readInt() != 0; config.noInternetAccess = in.readInt() != 0;
config.ephemeral = 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();