summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2011-12-06 21:06:03 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-12-06 21:06:03 -0800
commit8a4cd3b1053d92ecb34628218f303343746691f4 (patch)
treed9eabbdf1f699103301cbdad7d0dc5fa0f4a4ae3 /core/java/android
parent0a83e9d438f35cba62a10392fb9e7e1c577aa638 (diff)
parent19380daaf46815c80bd89fd9ca3af3c4095952b5 (diff)
downloadframeworks_base-8a4cd3b1053d92ecb34628218f303343746691f4.zip
frameworks_base-8a4cd3b1053d92ecb34628218f303343746691f4.tar.gz
frameworks_base-8a4cd3b1053d92ecb34628218f303343746691f4.tar.bz2
Merge "Disable poor network connection alone" into ics-mr1
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 74bcc9b..65b4e7e 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -3112,6 +3112,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