summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2011-12-06 21:09:44 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-12-06 21:09:44 -0800
commitbb60ee97664667c7774aa3c45b473332a3757d21 (patch)
treed08a14c473bb33652c5ac4d9b05b82476c45f711 /core/java/android
parentbfda435744fc110ba2c6ac070a09394a8608a422 (diff)
parent7c92e2dccb4e5cb5314455692ac32d2ccff24292 (diff)
downloadframeworks_base-bb60ee97664667c7774aa3c45b473332a3757d21.zip
frameworks_base-bb60ee97664667c7774aa3c45b473332a3757d21.tar.gz
frameworks_base-bb60ee97664667c7774aa3c45b473332a3757d21.tar.bz2
am 7c92e2dc: am 8a4cd3b1: Merge "Disable poor network connection alone" into ics-mr1
* commit '7c92e2dccb4e5cb5314455692ac32d2ccff24292': Disable poor network connection alone
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/provider/Settings.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 7b0e0ab..caff53b 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -3132,6 +3132,14 @@ public final class Settings {
"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.
* @hide