diff options
| author | Jack Tian <jack.tian@sonyericsson.com> | 2016-06-04 04:50:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-04 04:50:06 +0000 |
| commit | 58cbdef15c1c764435e1c6ae10dc4d19a780ea72 (patch) | |
| tree | c75d7cb72bdfb09aee9add731a3c7397bc0622f7 /service | |
| parent | a08979a41421d0412cf64c38ccb06da0c0d2135c (diff) | |
| parent | 5f4074fa7f8e61d27cd24c317a0a1b8a5ece4724 (diff) | |
Merge "DO NOT MERGE: Repeatedly prompting when no internet connection" into nyc-dev
am: 5f4074fa7f
* commit '5f4074fa7f8e61d27cd24c317a0a1b8a5ece4724':
DO NOT MERGE: Repeatedly prompting when no internet connection
Change-Id: I1360e20bc35bb91197bd8937c2296df3ae0912d8
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiNetworkHistory.java | 6 | ||||
| -rw-r--r-- | service/java/com/android/server/wifi/WifiStateMachine.java | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WifiNetworkHistory.java b/service/java/com/android/server/wifi/WifiNetworkHistory.java index cd1fe8b21..380b768c9 100644 --- a/service/java/com/android/server/wifi/WifiNetworkHistory.java +++ b/service/java/com/android/server/wifi/WifiNetworkHistory.java @@ -87,6 +87,7 @@ public class WifiNetworkHistory { private static final String SCORER_OVERRIDE_AND_SWITCH_KEY = "SCORER_OVERRIDE_AND_SWITCH"; private static final String VALIDATED_INTERNET_ACCESS_KEY = "VALIDATED_INTERNET_ACCESS"; private static final String NO_INTERNET_ACCESS_REPORTS_KEY = "NO_INTERNET_ACCESS_REPORTS"; + private static final String NO_INTERNET_ACCESS_EXPECTED_KEY = "NO_INTERNET_ACCESS_EXPECTED"; private static final String EPHEMERAL_KEY = "EPHEMERAL"; private static final String USE_EXTERNAL_SCORES_KEY = "USE_EXTERNAL_SCORES"; private static final String METERED_HINT_KEY = "METERED_HINT"; @@ -208,6 +209,8 @@ public class WifiNetworkHistory { + Integer.toString(config.numNoInternetAccessReports) + NL); out.writeUTF(VALIDATED_INTERNET_ACCESS_KEY + SEPARATOR + Boolean.toString(config.validatedInternetAccess) + NL); + out.writeUTF(NO_INTERNET_ACCESS_EXPECTED_KEY + SEPARATOR + + Boolean.toString(config.noInternetAccessExpected) + NL); out.writeUTF(EPHEMERAL_KEY + SEPARATOR + Boolean.toString(config.ephemeral) + NL); out.writeUTF(METERED_HINT_KEY + SEPARATOR @@ -412,6 +415,9 @@ public class WifiNetworkHistory { case VALIDATED_INTERNET_ACCESS_KEY: config.validatedInternetAccess = Boolean.parseBoolean(value); break; + case NO_INTERNET_ACCESS_EXPECTED_KEY: + config.noInternetAccessExpected = Boolean.parseBoolean(value); + break; case CREATION_TIME_KEY: config.creationTime = value; break; diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index 6a28c0c83..dc96096fc 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -7099,6 +7099,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss config = getCurrentWifiConfiguration(); if (config != null) { config.noInternetAccessExpected = accept; + mWifiConfigManager.writeKnownNetworkHistory(); } return HANDLED; case CMD_TEST_NETWORK_DISCONNECT: |