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

Merge "StorageManagerService: don't ignore failures to prepare user storage" am: 362f5eaf81

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

Change-Id: If953173de9ce7a72380b418540eb5afe5eefac0d
This commit is contained in:
Eric Biggers
2022-01-25 19:02:36 +00:00
committed by Automerger Merge Worker
parent ee177408c0 362f5eaf81
commit e4b491a38a
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

@@ -3620,8 +3620,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);
} }
} }