commit 2ba316f58e4429033caa495cbc22a0d66dd92d15
author Eric Biggers <ebiggers@google.com> Fri Aug 13 13:37:55 2021 -0700
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon May 16 21:11:02 2022 +0000
tree c9f7490595c673b99daaafb94a0d8615ff4e1348
parent 730f2e8ea1589d133876f08529c43d0727a67c3c

StorageManagerService: don't ignore failures to prepare user storage

We must never leave directories unencrypted.

Bug: 164488924
Bug: 224585613
Change-Id: I9a38ab5cca1ae9c9ebff81fca04615fd83ebe4b2
(cherry picked from commit 50946dd15fd14cbf92b5c7e32ac7a0f088b8b302)
Merged-In: I9a38ab5cca1ae9c9ebff81fca04615fd83ebe4b2
(cherry picked from commit 567e7a0476a3251d02705932268cd5f395ef863f)
Merged-In: I9a38ab5cca1ae9c9ebff81fca04615fd83ebe4b2

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 8727932..546d008 100644
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -3400,8 +3400,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);
         }
     }