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: ecffe3ecbf

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

Change-Id: I034fc93d091ee1944a5487e58dd61605bc8e19ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Eric Biggers
2022-04-20 21:39:18 +00:00
committed by Automerger Merge Worker
parent 49f031ea4d ecffe3ecbf
commit ee88d1fd14
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

@@ -3389,8 +3389,12 @@ class StorageManagerService extends IStorageManager.Stub
mInstaller.tryMountDataMirror(volumeUuid); mInstaller.tryMountDataMirror(volumeUuid);
} }
} }
} catch (Exception e) { } catch (RemoteException | Installer.InstallerException 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);
} }
} }