DO NOT MERGE: Fix to maintain the Carrier Network connection. (07998e8e) · Commits · e / os / android_frameworks_base

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -477,6 +477,12 @@ public class WifiConfiguration implements Parcelable {
		/ @hide /
		public static int INVALID_RSSI = -127;

		/**
		* @hide
		* Set to true if this is a Carrier Network, else set to false.
		*/
		public boolean isCarrierNetwork = false;

		/**
		* @hide
		* A summary of the RSSI and Band status for that configuration
		@@ -1559,6 +1565,7 @@ public class WifiConfiguration implements Parcelable {
		sbuf.append(" lcuid=" + lastConnectUid);
		sbuf.append(" userApproved=" + userApprovedAsString(userApproved));
		sbuf.append(" noInternetAccessExpected=" + noInternetAccessExpected);
		sbuf.append(" isCarrierNetwork=" + isCarrierNetwork);
		sbuf.append(" ");

		if (this.lastConnected != 0) {
		@@ -1908,6 +1915,7 @@ public class WifiConfiguration implements Parcelable {
		userApproved = source.userApproved;
		numNoInternetAccessReports = source.numNoInternetAccessReports;
		noInternetAccessExpected = source.noInternetAccessExpected;
		isCarrierNetwork = source.isCarrierNetwork;
		creationTime = source.creationTime;
		updateTime = source.updateTime;
		shared = source.shared;
		@@ -1973,6 +1981,7 @@ public class WifiConfiguration implements Parcelable {
		dest.writeInt(userApproved);
		dest.writeInt(numNoInternetAccessReports);
		dest.writeInt(noInternetAccessExpected ? 1 : 0);
		dest.writeInt(isCarrierNetwork ? 1 : 0);
		dest.writeInt(shared ? 1 : 0);
		dest.writeString(mPasspointManagementObjectTree);
		}
		@@ -2038,6 +2047,7 @@ public class WifiConfiguration implements Parcelable {
		config.userApproved = in.readInt();
		config.numNoInternetAccessReports = in.readInt();
		config.noInternetAccessExpected = in.readInt() != 0;
		config.isCarrierNetwork = in.readInt() != 0;
		config.shared = in.readInt() != 0;
		config.mPasspointManagementObjectTree = in.readString();
		return config;