commit 362f5eaf814851a5948b74a92fb671bfd88dbd18
author Eric Biggers <ebiggers@google.com> Tue Jan 25 18:47:44 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 25 18:47:44 2022 +0000
tree 0d1ebc79fcbb06a7461f41e5201665c7e75e4e8b
parent 685ef65d9ae74da8ec3a1000f233f3a7f38e97f0
parent 9d2bb776ed13181b8fe5b3ac4f9565f3f903227c

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

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

diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
index 53c8635..9546496 100644
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -3620,8 +3620,12 @@
                     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);
         }
     }