Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70a85687 authored by Ben Komalo's avatar Ben Komalo Committed by Android Git Automerger
Browse files

am 85a61c4d: Merge "Only run "core" apps when encrypting device." into ics-factoryrom 

* commit '85a61c4d':
  Only run "core" apps when encrypting device.
parents 4b5441a7 85a61c4d

services/java/com/android/server/SystemServer.java

+8 −1
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ import java.util.TimerTask; 


class ServerThread extends Thread {

    private static final String TAG = "SystemServer";

    private static final String ENCRYPTING_STATE = "trigger_restart_min_framework";



    ContentResolver mContentResolver;
@@ -147,9 +148,15 @@ class ServerThread extends Thread { 
            AttributeCache.init(context);



            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,

                    factoryTest != SystemServer.FACTORY_TEST_OFF,

                    false);

                    onlyCore);



            ActivityManagerService.setSystemProcess();