summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/core/java/com/android/server/MountService.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/MountService.java b/services/core/java/com/android/server/MountService.java
index 24d81a0e6700..e400fb67c0c7 100644
--- a/services/core/java/com/android/server/MountService.java
+++ b/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();