diff options
| author | Kenny Root <kroot@google.com> | 2011-08-17 17:49:28 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2011-08-17 17:49:30 -0700 |
| commit | 07714d41e57ef9d8e2e6b40d8764e42053cce1bd (patch) | |
| tree | 9532cf2e15a574170b3ee269db890dfff3a09256 /services/java/com/android/server/MountService.java | |
| parent | 4a8d9ad8acfd675a7f4d532c6564d3985ff67138 (diff) | |
| download | frameworks_base-07714d41e57ef9d8e2e6b40d8764e42053cce1bd.zip frameworks_base-07714d41e57ef9d8e2e6b40d8764e42053cce1bd.tar.gz frameworks_base-07714d41e57ef9d8e2e6b40d8764e42053cce1bd.tar.bz2 | |
Default disable watchdog for vold connection
cryptfs has long-running operations that cause the Watchdog to fire
reliably when encrypting the filesystem. Disable Watchdog on
MountService for this reason.
Change-Id: Id03f5f60c704dcd74a8696ad9f32b5fba5381731
Diffstat (limited to 'services/java/com/android/server/MountService.java')
| -rw-r--r-- | services/java/com/android/server/MountService.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/services/java/com/android/server/MountService.java b/services/java/com/android/server/MountService.java index fd03201..00aa14c 100644 --- a/services/java/com/android/server/MountService.java +++ b/services/java/com/android/server/MountService.java @@ -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); + } } /** |