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

Commit b910363a authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

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

Merge "StorageManagerService: don't ignore failures to prepare user storage" am: 362f5eaf am: e4b491a3 am: 9bb65485

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

Change-Id: I09fbe029289f6523ec665ee5e55ec3642d551a8c
parents 5f6aaa66 9bb65485

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

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

        }

    }