Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3c72874 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Re-enable vold watchdog. 

Awhile back we moved vold over to use Binder, which means we can now
execute multiple parallel calls down to vold.  We instead have a lock
on the vold side to ensure certain calls continue to be serialized,
but all long-running operations now use callbacks.

Thus the vold lock should be low-contention, and any operations that
wedge vold should cause the watchdog to fire and help the device
recover.

Bug: 80472979
Test: manual
Change-Id: Ie2ec68f1fa0ff895153438fcebbe1f2a4e8be0a7
parent 7bb9fcbc

services/core/java/com/android/server/StorageManagerService.java

+6 −2
Original line number Diff line number Diff line
@@ -220,8 +220,12 @@ class StorageManagerService extends IStorageManager.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;

    /**

     * We now talk to vold over Binder, and it has its own internal lock to

     * serialize certain calls. All long-running operations have been migrated

     * to be async with callbacks, so we want watchdog to fire if vold wedges.

     */

    private static final boolean WATCHDOG_ENABLE = true;



    /**

     * Our goal is for all Android devices to be usable as development devices,