Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d1106fc9: Merge "Default disable watchdog for vold connection"

Browse Source 
* commit 'd1106fc9bff66ac4f93f9d6291f0d0136bb544e7':
  Default disable watchdog for vold connection
This commit is contained in:
Kenny Root
2011-08-18 09:22:24 -07:00
committed by Android Git Automerger
parent 91ba480bc6 d1106fc9bf
commit 47faa20e26
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/java/com/android/server/MountService.java
View File

@@ -97,6 +97,9 @@ class MountService extends IMountService.Stub
private static final boolean DEBUG_EVENTS = false;
private static final boolean DEBUG_OBB = false;
// Disable this since it messes up long-running cryptfs operations.
private static final boolean WATCHDOG_ENABLE = false;
private static final String TAG = "MountService";
private static final String VOLD_TAG = "VoldConnector";
@@ -1182,8 +1185,10 @@ class MountService extends IMountService.Stub
Thread thread = new Thread(mConnector, VOLD_TAG);
thread.start();
// Add ourself to the Watchdog monitors.
Watchdog.getInstance().addMonitor(this);
// Add ourself to the Watchdog monitors if enabled.
if (WATCHDOG_ENABLE) {
Watchdog.getInstance().addMonitor(this);
}
}
/**