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

Commit ff4461ae authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "unencrypted-dirs-s" into sc-mainline-prod 

* changes:
  [automerge] StorageManagerService: don't ignore failures to prepare user storage 2p: 567e7a04
  StorageManagerService: don't ignore failures to prepare user storage
parents e45716b6 465d717d

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);

        }

    }