diff options
| author | vandwalle <vandwalle@google.com> | 2014-12-12 12:25:31 -0800 |
|---|---|---|
| committer | vandwalle <vandwalle@google.com> | 2014-12-16 12:28:11 -0800 |
| commit | 82f9342c26900256a1bf6bef7b40a775116bf57c (patch) | |
| tree | 195b13e6a43cdefb8333f28d967843ed1f9f77f5 /service | |
| parent | 6a0c6896aa7f72744f8b3d65b3dcc7ea0c063bc7 (diff) | |
| download | android_frameworks_opt_net_wifi-82f9342c26900256a1bf6bef7b40a775116bf57c.tar.gz android_frameworks_opt_net_wifi-82f9342c26900256a1bf6bef7b40a775116bf57c.tar.bz2 android_frameworks_opt_net_wifi-82f9342c26900256a1bf6bef7b40a775116bf57c.zip | |
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.
Change-Id: I661b326c6f5dfacfcc5582cea14dc52501740367
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; } /** |