summaryrefslogtreecommitdiffstats
path: root/wifi
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2011-12-06 16:04:30 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-12-06 16:04:30 -0800
commit591f6fa7c7dc9b82ccd6d5b0d758116babbaa058 (patch)
tree29e879e44814b2afd0ec7f9935239f3154a916de /wifi
parentf9bb1cd1fcff7079445dae494ce5d56276092c11 (diff)
parent5e2e7d5fb81266640f8284abb25fe8be06693f5b (diff)
downloadframeworks_base-591f6fa7c7dc9b82ccd6d5b0d758116babbaa058.zip
frameworks_base-591f6fa7c7dc9b82ccd6d5b0d758116babbaa058.tar.gz
frameworks_base-591f6fa7c7dc9b82ccd6d5b0d758116babbaa058.tar.bz2
am 5e2e7d5f: am 40cb30c2: am 7b62313e: Disable wifiwatchdog for now
* commit '5e2e7d5fb81266640f8284abb25fe8be06693f5b': Disable wifiwatchdog for now
Diffstat (limited to 'wifi')
-rw-r--r--wifi/java/android/net/wifi/WifiWatchdogStateMachine.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/WifiWatchdogStateMachine.java b/wifi/java/android/net/wifi/WifiWatchdogStateMachine.java
index f330c32..c58253d 100644
--- a/wifi/java/android/net/wifi/WifiWatchdogStateMachine.java
+++ b/wifi/java/android/net/wifi/WifiWatchdogStateMachine.java
@@ -386,7 +386,9 @@ public class WifiWatchdogStateMachine extends StateMachine {
}
private boolean isWatchdogEnabled() {
- return getSettingsBoolean(mContentResolver, Settings.Secure.WIFI_WATCHDOG_ON, true);
+ //return getSettingsBoolean(mContentResolver, Settings.Secure.WIFI_WATCHDOG_ON, true);
+ //TODO: fix this when we do aggressive monitoring
+ return false;
}
private void updateSettings() {