diff options
| author | 2024-09-26 13:08:22 +0000 | |
|---|---|---|
| committer | 2024-09-26 13:08:22 +0000 | |
| commit | f342591792c01e3abbcd0c43efda8aa945da8b08 (patch) | |
| tree | 203522b41b2c2bae2f2dc1189d0f6d12b2c72b77 | |
| parent | 3bd16e84c0a5dd3c6f6437b11aa40eb9181ce62c (diff) | |
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
| -rw-r--r-- | services/core/java/com/android/server/StorageManagerService.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java index d86bae19f174..e64a4803b14f 100644 --- a/services/core/java/com/android/server/StorageManagerService.java +++ b/services/core/java/com/android/server/StorageManagerService.java @@ -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(); } |