Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO NOT MERGE: Fix to maintain the Carrier Network connection.

Browse Source 
am: e45b50293e

Change-Id: I6a48b308cd461097a195a073249cde096cc74886
This commit is contained in:
pkanwar
2017-01-13 20:58:09 +00:00
committed by android-build-merger
parent ace5aea996 e45b50293e
commit 07998e8e26
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wifi/java/android/net/wifi/WifiConfiguration.java
View File

@@ -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;