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

Commit f3425917 authored by Martijn Coenen's avatar Martijn Coenen
Browse files

StorageManagerService: increase watchdog timeout. 

We know that vold's unmount() operation can take more than 20 seconds to complete, in the worst case, due to use of four 5-second long sleeps. Adjust the timeout accordingly.

Bug: 369519866
Change-Id: Iaf760038176449158c818c163a0802b81476bad1
Test: N/A
Flag: EXEMPT bugfix
parent 3bd16e84

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

+2 −2
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ class StorageManagerService extends IStorageManager.Stub 
    public static final int FAILED_MOUNT_RESET_TIMEOUT_SECONDS = 10;



    /** Extended timeout for the system server watchdog. */

    private static final int SLOW_OPERATION_WATCHDOG_TIMEOUT_MS = 20 * 1000;

    private static final int SLOW_OPERATION_WATCHDOG_TIMEOUT_MS = 30 * 1000;



    /** Extended timeout for the system server watchdog for vold#partition operation. */

    private static final int PARTITION_OPERATION_WATCHDOG_TIMEOUT_MS = 3 * 60 * 1000;
@@ -3251,7 +3251,7 @@ class StorageManagerService extends IStorageManager.Stub 
        if (Binder.getCallingUid() != android.os.Process.SYSTEM_UID) {

            throw new SecurityException("no permission to commit checkpoint changes");

        }



        extendWatchdogTimeout("vold#commitChanges might be slow");

        mVold.commitChanges();

    }