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

Commit 0f167f7c authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I6045ccc6b079e684f7d5e4bb99e6bd37f01e4bf4
parents 1bb171fc 2ad10d0d

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

+7 −0
Original line number Diff line number Diff line
@@ -2259,8 +2259,15 @@ class StorageManagerService extends IStorageManager.Stub 
        enforcePermission(android.Manifest.permission.MOUNT_FORMAT_FILESYSTEMS);



        final VolumeInfo vol = findVolumeByIdOrThrow(volId);

        final String fsUuid = vol.fsUuid;

        try {

            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) {

            Slog.wtf(TAG, e);

        }