From 07714d41e57ef9d8e2e6b40d8764e42053cce1bd Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Wed, 17 Aug 2011 17:49:28 -0700 Subject: 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 --- services/java/com/android/server/MountService.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'services/java/com/android/server/MountService.java') 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); + } } /** -- cgit v1.1