diff options
| author | 2025-02-18 14:23:56 +0000 | |
|---|---|---|
| committer | 2025-02-18 14:29:55 +0000 | |
| commit | 980b248db53cebd1de7aa973a3a95e7c877c497e (patch) | |
| tree | c532da57d5f7522d8de05a54ce725a0bcabebd61 | |
| parent | d9f8e5f2494d4c5b96de510ea73467a8944c34b9 (diff) | |
Extend watchdog timeout in case of unmounting
Unmounting public volumes through Settings app would call into unmount
method in StorageManagerService. Unmounting could take long time to
complete. Hence, calling extendWatchdogTimeout to make sure that
Watchdog won't throw given it's known that unmounting is long running
operation, that's not really blocked.
Test: Manual
Bug: 369519866
Flag: EXEMPT bugfix
Change-Id: I1a307372fc08dc6f36c479a586648defe32d3a86
| -rw-r--r-- | services/core/java/com/android/server/StorageManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java index d2a5734f323f..b6fe0ad37078 100644 --- a/services/core/java/com/android/server/StorageManagerService.java +++ b/services/core/java/com/android/server/StorageManagerService.java @@ -49,7 +49,6 @@ import static com.android.internal.util.XmlUtils.writeStringAttribute; import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT; import static org.xmlpull.v1.XmlPullParser.START_TAG; -import android.annotation.EnforcePermission; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.UserIdInt; @@ -2443,6 +2442,7 @@ class StorageManagerService extends IStorageManager.Stub } catch (Installer.InstallerException e) { Slog.e(TAG, "Failed unmount mirror data", e); } + extendWatchdogTimeout("#unmount might be slow"); mVold.unmount(vol.getId()); mStorageSessionController.onVolumeUnmount(vol.getImmutableVolumeInfo()); } catch (Exception e) { |