summaryrefslogtreecommitdiffstats
path: root/wifi/java/android
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2011-12-06 11:34:58 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-12-06 11:34:58 -0800
commit40cb30c2df2176c03f24cbdc194e3af5a4f64758 (patch)
tree84c2ec13c9187b017393501695111e2a472303ba /wifi/java/android
parent98a85c2de6b3f27ba1ccb2cfd44a775b4f490f72 (diff)
parent7b62313eab4af8835a64fb3fe1e15e5e534a9479 (diff)
downloadframeworks_base-40cb30c2df2176c03f24cbdc194e3af5a4f64758.zip
frameworks_base-40cb30c2df2176c03f24cbdc194e3af5a4f64758.tar.gz
frameworks_base-40cb30c2df2176c03f24cbdc194e3af5a4f64758.tar.bz2
am 7b62313e: Disable wifiwatchdog for now
* commit '7b62313eab4af8835a64fb3fe1e15e5e534a9479': Disable wifiwatchdog for now
Diffstat (limited to 'wifi/java/android')
-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() {