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

Merge changes from topic "unencrypted-dirs-s" into sc-mainline-prod

Browse Source 
* changes:
  [automerge] StorageManagerService: don't ignore failures to prepare user storage 2p: 567e7a0476
  StorageManagerService: don't ignore failures to prepare user storage
This commit is contained in:
TreeHugger Robot
2022-04-20 20:22:16 +00:00
committed by Android (Google) Code Review
parent e45716b635 465d717d6d
commit ff4461ae55
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

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