[automerge] StorageManagerService: don't ignore failures to prepare user storage 2p: 567e7a0476 am: 63fec800ad

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

Change-Id: Ie33a08f08b63cde747a213f0d1acf69732d909eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

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