Merge "Don't drop WifiConfiguration's ephemeral bit on copy/parcel." into lmp-mr1-dev (074c5b5b) · Commits · e / os / android_frameworks_base

wifi/java/android/net/wifi/WifiConfiguration.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -977,7 +977,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:");
		@@ -1434,6 +1435,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);
		}
		@@ -1510,6 +1512,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);
		@@ -1570,6 +1573,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();