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

Commit 8d23a177 authored by Martin Stjernholm's avatar Martin Stjernholm Committed by Automerger Merge Worker
Browse files

Merge "Initialize AppHibernationService before ArtManagerLocal." into udc-dev am: 8cdc4c6c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21958106



Change-Id: I74d6def45d06dce3bbf7a5842a7854aa45f9e2de
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 48e2d9ef 8cdc4c6c

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

+4 −4
Original line number Original line Diff line number Diff line
@@ -1793,6 +1793,10 @@ public final class SystemServer implements Dumpable { 
        }

        }

        t.traceEnd();

        t.traceEnd();





        t.traceBegin("StartAppHibernationService");

        mSystemServiceManager.startService(APP_HIBERNATION_SERVICE_CLASS);

        t.traceEnd();



        t.traceBegin("ArtManagerLocal");

        t.traceBegin("ArtManagerLocal");

        DexOptHelper.initializeArtManagerLocal(context, mPackageManagerService);

        DexOptHelper.initializeArtManagerLocal(context, mPackageManagerService);

        t.traceEnd();

        t.traceEnd();
@@ -2316,10 +2320,6 @@ public final class SystemServer implements Dumpable { 
            mSystemServiceManager.startService(VOICE_RECOGNITION_MANAGER_SERVICE_CLASS);

            mSystemServiceManager.startService(VOICE_RECOGNITION_MANAGER_SERVICE_CLASS);

            t.traceEnd();

            t.traceEnd();





            t.traceBegin("StartAppHibernationService");

            mSystemServiceManager.startService(APP_HIBERNATION_SERVICE_CLASS);

            t.traceEnd();



            if (GestureLauncherService.isGestureLauncherEnabled(context.getResources())) {

            if (GestureLauncherService.isGestureLauncherEnabled(context.getResources())) {

                t.traceBegin("StartGestureLauncher");

                t.traceBegin("StartGestureLauncher");

                mSystemServiceManager.startService(GestureLauncherService.class);

                mSystemServiceManager.startService(GestureLauncherService.class);