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

Commit 31deee5e authored by Paul Lawrence's avatar Paul Lawrence Committed by android-build-merger
Browse files

am c220d8e5: Stop crypto UI from crashing during encryption automerge: 0e6178b8 

automerge: e20dd304

* commit 'e20dd304':
  Stop crypto UI from crashing during encryption
parents 4329ad3b e20dd304

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

+3 −1
Original line number Diff line number Diff line
@@ -826,7 +826,9 @@ class MountService extends IMountService.Stub 


                // On an encrypted device we can't see system properties yet, so pull

                // the system locale out of the mount service.

                if ("".equals(SystemProperties.get("vold.encrypt_progress"))) {

                    copyLocaleFromMountService();

                }



                // Let package manager load internal ASECs.

                mPms.scanAvailableAsecs();