Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Forget volumes that have been freshly formatted." into rvc-dev am: 2ad10d0dde am: 0f167f7cd0

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11883072

Change-Id: I11a3ee8b7adb2c6cc66407d2fd829cd5962994b5
This commit is contained in:
Jeff Sharkey
2020-06-18 16:47:41 +00:00
committed by Automerger Merge Worker
parent 4a656b9c52 0f167f7cd0
commit bbdd798bed
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/StorageManagerService.java
View File

@@ -2259,8 +2259,15 @@ class StorageManagerService extends IStorageManager.Stub
enforcePermission(android.Manifest.permission.MOUNT_FORMAT_FILESYSTEMS); enforcePermission(android.Manifest.permission.MOUNT_FORMAT_FILESYSTEMS);
final VolumeInfo vol = findVolumeByIdOrThrow(volId); final VolumeInfo vol = findVolumeByIdOrThrow(volId);
final String fsUuid = vol.fsUuid;
try { try {
mVold.format(vol.id, "auto"); mVold.format(vol.id, "auto");
// After a successful format above, we should forget about any
// records for the old partition, since it'll never appear again
if (!TextUtils.isEmpty(fsUuid)) {
forgetVolume(fsUuid);
}
} catch (Exception e) { } catch (Exception e) {
Slog.wtf(TAG, e); Slog.wtf(TAG, e);
} }