am 196f1bd0: am a92f380f: Merge "Have poor network avoidance turned off by default" into jb-mr1-dev

* commit '196f1bd0d03255d25c907390d907f9114e3d4749':
  Have poor network avoidance turned off by default
This commit is contained in:
Irfan Sheriff
2012-10-09 16:35:52 -07:00
committed by Android Git Automerger

View File

@@ -19,6 +19,7 @@ package com.android.settings.wifi;
import android.content.Context; import android.content.Context;
import android.net.wifi.WifiInfo; import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.net.wifi.WifiWatchdogStateMachine;
import android.os.Bundle; import android.os.Bundle;
import android.preference.CheckBoxPreference; import android.preference.CheckBoxPreference;
import android.preference.ListPreference; import android.preference.ListPreference;
@@ -81,7 +82,9 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment
getPreferenceScreen().removePreference(poorNetworkDetection); getPreferenceScreen().removePreference(poorNetworkDetection);
} else { } else {
poorNetworkDetection.setChecked(Global.getInt(getContentResolver(), 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);
} }
} }