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

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

Browse Source 
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: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Eric Biggers
2022-04-25 18:04:16 +00:00
committed by Automerger Merge Worker
parent 5f72388c49 f80dd3ecd4
commit 9d4c8b604a
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2847,8 +2847,12 @@ class StorageManagerService extends IStorageManager.Stub
try { try {
mVold.prepareUserStorage(volumeUuid, userId, serialNumber, flags); mVold.prepareUserStorage(volumeUuid, userId, serialNumber, flags);
} catch (Exception e) { } catch (RemoteException e) {
Slog.wtf(TAG, 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);
} }
} }