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

Commit 9d4c8b60 authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

[RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare... 

[RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare user storage am: f80dd3ec

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



Change-Id: If7e2bb688e37a55b874d25f4e1621f3998b4d9af
Ignore-AOSP-First: this is an automerge
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5f72388c f80dd3ec

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

+5 −1
Original line number Diff line number Diff line
@@ -2847,8 +2847,12 @@ class StorageManagerService extends IStorageManager.Stub 


        try {

            mVold.prepareUserStorage(volumeUuid, userId, serialNumber, flags);

        } catch (Exception e) {

        } catch (RemoteException e) {

            Slog.wtf(TAG, e);

            // Make sure to re-throw this exception; we must not ignore failure

            // to prepare the user storage as it could indicate that encryption

            // wasn't successfully set up.

            throw new RuntimeException(e);

        }

    }