am 8a4cd3b1: Merge "Disable poor network connection alone" into ics-mr1

* commit '8a4cd3b1053d92ecb34628218f303343746691f4':
  Disable poor network connection alone
This commit is contained in:
Irfan Sheriff
2011-12-07 11:03:26 -08:00
committed by Android Git Automerger
2 changed files with 49 additions and 11 deletions

View File

@@ -3123,6 +3123,14 @@ public final class Settings {
public static final String WIFI_WATCHDOG_BLACKLIST_FOLLOWUP_INTERVAL_MS =
"wifi_watchdog_blacklist_followup_interval_ms";
/**
* Setting to turn off poor network avoidance on Wi-Fi. Feature is disabled by default and
* the setting needs to be set to 1 to enable it.
* @hide
*/
public static final String WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED =
"wifi_watchdog_poor_network_test_enabled";
/**
* Setting to turn off walled garden test on Wi-Fi. Feature is enabled by default and
* the setting needs to be set to 0 to disable it.