am 1199a4c4: am f2a598e4: am 074c5b5b: Merge "Don\'t drop WifiConfiguration\'s ephemeral bit on copy/parcel." into lmp-mr1-dev
* commit '1199a4c436b4e08306c02f615360e233124bff55':
Don't drop WifiConfiguration's ephemeral bit on copy/parcel.
diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java
index 6220650..853d843 100644
--- a/wifi/java/android/net/wifi/WifiConfiguration.java
+++ b/wifi/java/android/net/wifi/WifiConfiguration.java
@@ -1033,7 +1033,8 @@
if (this.didSelfAdd) sbuf.append(" didSelfAdd");
if (this.selfAdded) sbuf.append(" selfAdded");
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(" KeyMgmt:");
@@ -1509,6 +1510,7 @@
autoJoinStatus = source.autoJoinStatus;
selfAdded = source.selfAdded;
noInternetAccess = source.noInternetAccess;
+ ephemeral = source.ephemeral;
if (source.visibility != null) {
visibility = new Visibility(source.visibility);
}
@@ -1588,6 +1590,7 @@
dest.writeInt(selfAdded ? 1 : 0);
dest.writeInt(didSelfAdd ? 1 : 0);
dest.writeInt(noInternetAccess ? 1 : 0);
+ dest.writeInt(ephemeral ? 1 : 0);
dest.writeInt(creatorUid);
dest.writeInt(lastConnectUid);
dest.writeInt(lastUpdateUid);
@@ -1651,6 +1654,7 @@
config.selfAdded = in.readInt() != 0;
config.didSelfAdd = in.readInt() != 0;
config.noInternetAccess = in.readInt() != 0;
+ config.ephemeral = in.readInt() != 0;
config.creatorUid = in.readInt();
config.lastConnectUid = in.readInt();
config.lastUpdateUid = in.readInt();