Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
automerge: 31deee5

* commit '31deee5e307c00245d0fc7fd09dfe299145e1e0c':
  Stop crypto UI from crashing during encryption
This commit is contained in:
Paul Lawrence
2014-10-24 21:30:13 +00:00
committed by android-build-merger
parent a8aa03efa7 31deee5e30
commit 60302f1938
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/MountService.java
View File

@@ -826,7 +826,9 @@ class MountService extends IMountService.Stub
// On an encrypted device we can't see system properties yet, so pull // On an encrypted device we can't see system properties yet, so pull
// the system locale out of the mount service. // the system locale out of the mount service.
if ("".equals(SystemProperties.get("vold.encrypt_progress"))) {
copyLocaleFromMountService(); copyLocaleFromMountService();
}
// Let package manager load internal ASECs. // Let package manager load internal ASECs.
mPms.scanAvailableAsecs(); mPms.scanAvailableAsecs();