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

Browse Source 
automerge: 0e6178b

* commit '0e6178b81eb5a09253acbb6e28ee863ffbf8a5a5':
  Stop crypto UI from crashing during encryption
This commit is contained in:
Paul Lawrence
2014-10-24 20:56:22 +00:00
committed by android-build-merger
parent 1ac52667ee 0e6178b81e
commit e20dd304b7
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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