am 7b62313: Disable wifiwatchdog for now

isheriff · Android Git Automerger · commit 40cb30c2df21 · 2011-12-06T11:34:58.000-08:00
* commit '7b62313eab4af8835a64fb3fe1e15e5e534a9479':
  Disable wifiwatchdog for now
diff --git a/wifi/java/android/net/wifi/WifiWatchdogStateMachine.java b/wifi/java/android/net/wifi/WifiWatchdogStateMachine.java
@@ -386,7 +386,9 @@ public void dump(PrintWriter pw) {
     }
 
     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() {

Original file line number	Diff line number	Diff line change
`@@ -386,7 +386,9 @@ public void dump(PrintWriter pw) {`
`386`	`386`	`}`
`387`	`387`
`388`	`388`	`private boolean isWatchdogEnabled() {`
`389`		`- return getSettingsBoolean(mContentResolver, Settings.Secure.WIFI_WATCHDOG_ON, true);`
	`389`	`+ //return getSettingsBoolean(mContentResolver, Settings.Secure.WIFI_WATCHDOG_ON, true);`
	`390`	`+ //TODO: fix this when we do aggressive monitoring`
	`391`	`+ return false;`
`390`	`392`	`}`
`391`	`393`
`392`	`394`	`private void updateSettings() {`