From e45b50293eb9f13596b3a797ecc6815a443d0cdf Mon Sep 17 00:00:00 2001 From: pkanwar Date: Thu, 12 Jan 2017 19:17:00 -0800 Subject: [PATCH] DO NOT MERGE: Fix to maintain the Carrier Network connection. Added isCarrierNetwork param in WifiConfiguration, which is then used in WifiStateMachine. After this change, the connection to Carrier Network should be maintained. BUG: 30760683 Change-Id: I88e01ff44f494a6eda5e2e8a088d069638b72c89 --- wifi/java/android/net/wifi/WifiConfiguration.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index f1239802751d..33ef483c1cae 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -479,6 +479,12 @@ public class WifiConfiguration implements Parcelable { /** * @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 * This is used as a temporary value by the auto-join controller */ @@ -1552,6 +1558,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) { @@ -1917,6 +1924,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; @@ -1988,6 +1996,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); } @@ -2059,6 +2068,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; -- 2.11.0