From 8faf2a2a15853368a14babf935c156664b5f0b6c Mon Sep 17 00:00:00 2001 From: Jeff Davidson Date: Mon, 6 Oct 2014 16:16:35 -0700 Subject: [PATCH] Don't drop WifiConfiguration's ephemeral bit on copy/parcel. Bug: 15892711 Change-Id: I4a027c99634a11d13bb3c8420ba959c201644689 --- wifi/java/android/net/wifi/WifiConfiguration.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index 53756d22a396..4b29f56e1092 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -941,7 +941,8 @@ public class WifiConfiguration implements Parcelable { 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:"); @@ -1378,6 +1379,7 @@ public class WifiConfiguration implements Parcelable { autoJoinStatus = source.autoJoinStatus; selfAdded = source.selfAdded; noInternetAccess = source.noInternetAccess; + ephemeral = source.ephemeral; if (source.visibility != null) { visibility = new Visibility(source.visibility); } @@ -1454,6 +1456,7 @@ public class WifiConfiguration implements Parcelable { 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); @@ -1514,6 +1517,7 @@ public class WifiConfiguration implements Parcelable { 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(); -- 2.11.0