drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only run "core" apps when encrypting device." into ics-factoryrom

Browse Source
This commit is contained in:
Ben Komalo
2011-09-19 16:52:37 -07:00
committed by Android (Google) Code Review
parent 6c03850616 553acf0409
commit 85a61c4d6f
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/java/com/android/server/SystemServer.java
View File

@ -64,6 +64,7 @@ import java.util.TimerTask;
class ServerThread extends Thread { class ServerThread extends Thread {
private static final String TAG = "SystemServer"; private static final String TAG = "SystemServer";
private static final String ENCRYPTING_STATE = "trigger_restart_min_framework";
ContentResolver mContentResolver; ContentResolver mContentResolver;
@ -147,9 +148,15 @@ class ServerThread extends Thread {
AttributeCache.init(context); AttributeCache.init(context);
Slog.i(TAG, "Package Manager"); Slog.i(TAG, "Package Manager");
// Only run "core" apps if we're encrypting the device.
String cryptState = SystemProperties.get("vold.decrypt");
boolean onlyCore = ENCRYPTING_STATE.equals(cryptState);
if (onlyCore) {
Slog.w(TAG, "Detected encryption in progress - only parsing core apps");
}
pm = PackageManagerService.main(context, pm = PackageManagerService.main(context,
factoryTest != SystemServer.FACTORY_TEST_OFF, factoryTest != SystemServer.FACTORY_TEST_OFF,
false); onlyCore);
ActivityManagerService.setSystemProcess(); ActivityManagerService.setSystemProcess();