Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 465d717d authored by Eric Biggers's avatar Eric Biggers Committed by Presubmit Automerger Backend
Browse files

[automerge] StorageManagerService: don't ignore failures to prepare user storage 2p: 567e7a04 

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

Bug: 164488924
Bug: 224585613
Change-Id: I2144b6e848dffc9a8b3af9983e16644d2d5b5785
Merged-In: I9a38ab5cca1ae9c9ebff81fca04615fd83ebe4b2
parents 62bd1b98 567e7a04

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

+5 −1
Original line number Diff line number Diff line
@@ -3397,8 +3397,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);

        }

    }