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

automerge: e20dd30

* commit 'e20dd304b74c7479e1471780e985416902a9b9e9':
  Stop crypto UI from crashing during encryption

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

@@ -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.
-                copyLocaleFromMountService();
+                if ("".equals(SystemProperties.get("vold.encrypt_progress"))) {
+                    copyLocaleFromMountService();
+                }
 
                 // Let package manager load internal ASECs.
                 mPms.scanAvailableAsecs();