diff options
| author | vandwalle <vandwalle@google.com> | 2014-12-18 22:15:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-18 22:15:38 +0000 |
| commit | 84070068b0aff877437f4ecbcac8b6f4fe976d32 (patch) | |
| tree | 56be0f046094e1ee8d51c10d49e8af5fb95eed96 /service | |
| parent | 16fdf07021858fd116d96a5fb00ddb3c166d5ae6 (diff) | |
| parent | 82f9342c26900256a1bf6bef7b40a775116bf57c (diff) | |
| download | android_frameworks_opt_net_wifi-84070068b0aff877437f4ecbcac8b6f4fe976d32.tar.gz android_frameworks_opt_net_wifi-84070068b0aff877437f4ecbcac8b6f4fe976d32.tar.bz2 android_frameworks_opt_net_wifi-84070068b0aff877437f4ecbcac8b6f4fe976d32.zip | |
Merge "Disable legacy poor Network detection Bug:18723206 Legacy poor network detection was removed from L settings but can still be enabled during an upgrade if it had been manually enabled by user, now really disable it." into lmp-mr1-dev
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiWatchdogStateMachine.java | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/service/java/com/android/server/wifi/WifiWatchdogStateMachine.java b/service/java/com/android/server/wifi/WifiWatchdogStateMachine.java index 181e043d2..0ef18e6ae 100644 --- a/service/java/com/android/server/wifi/WifiWatchdogStateMachine.java +++ b/service/java/com/android/server/wifi/WifiWatchdogStateMachine.java @@ -435,15 +435,8 @@ public class WifiWatchdogStateMachine extends StateMachine { private void updateSettings() { if (DBG) logd("Updating secure settings"); - // disable poor network avoidance - if (sWifiOnly) { - logd("Disabling poor network avoidance for wi-fi only device"); - mPoorNetworkDetectionEnabled = false; - } else { - mPoorNetworkDetectionEnabled = getSettingsGlobalBoolean(mContentResolver, - Settings.Global.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED, - WifiManager.DEFAULT_POOR_NETWORK_AVOIDANCE_ENABLED); - } + // Unconditionally disable poor network avoidance, since this mechanism is obsolete + mPoorNetworkDetectionEnabled = false; } /** |