diff options
| author | Irfan Sheriff <isheriff@google.com> | 2012-10-09 16:32:25 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-09 16:32:25 -0700 |
| commit | a92f380f866be566d2f47ffa14ade81e6551ca56 (patch) | |
| tree | f1edac731d239e7d5b226b5b23c36acd4235f026 | |
| parent | 2fc940351f907e3bea533363bd4a103be65c3855 (diff) | |
| parent | ba50175b1c059320a20dd795270474f2c604811a (diff) | |
| download | packages_apps_Settings-a92f380f866be566d2f47ffa14ade81e6551ca56.zip packages_apps_Settings-a92f380f866be566d2f47ffa14ade81e6551ca56.tar.gz packages_apps_Settings-a92f380f866be566d2f47ffa14ade81e6551ca56.tar.bz2 | |
Merge "Have poor network avoidance turned off by default" into jb-mr1-dev
| -rw-r--r-- | src/com/android/settings/wifi/AdvancedWifiSettings.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/settings/wifi/AdvancedWifiSettings.java b/src/com/android/settings/wifi/AdvancedWifiSettings.java index e02d4d7..809496a 100644 --- a/src/com/android/settings/wifi/AdvancedWifiSettings.java +++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java @@ -19,6 +19,7 @@ package com.android.settings.wifi; import android.content.Context; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; +import android.net.wifi.WifiWatchdogStateMachine; import android.os.Bundle; import android.preference.CheckBoxPreference; import android.preference.ListPreference; @@ -81,7 +82,9 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment getPreferenceScreen().removePreference(poorNetworkDetection); } else { poorNetworkDetection.setChecked(Global.getInt(getContentResolver(), - Global.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED, 1) == 1); + Global.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED, + WifiWatchdogStateMachine.DEFAULT_POOR_NETWORK_AVOIDANCE_ENABLED ? + 1 : 0) == 1); } } |