diff options
| author | 2025-02-20 02:45:33 -0800 | |
|---|---|---|
| committer | 2025-02-20 02:45:33 -0800 | |
| commit | 793ae0501e6b25106a5ce0ee78d74ff75f1c7cf4 (patch) | |
| tree | 5e42031faaedfbda6d24d2d1821d037015b7f12d /services | |
| parent | eccb3eed455e5d6fb93707f6d9430e6fcfc48929 (diff) | |
| parent | 980b248db53cebd1de7aa973a3a95e7c877c497e (diff) | |
Merge "Extend watchdog timeout in case of unmounting" into main
Diffstat (limited to 'services')
| -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) { |