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

Commit 70b8b551 authored by Martin Stjernholm's avatar Martin Stjernholm Committed by Android (Google) Code Review
Browse files

Merge "Fix ART Service initialization order problems."

parents 4f69147f 48b9a472

services/core/java/com/android/server/pm/DexOptHelper.java

+11 −1
Original line number Diff line number Diff line
@@ -40,8 +40,10 @@ import static dalvik.system.DexFile.isProfileGuidedCompilerFilter; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.AppGlobals;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.pm.ResolveInfo;

import android.content.pm.SharedLibraryInfo;

import android.content.pm.dex.ArtManager;
@@ -1019,8 +1021,16 @@ public final class DexOptHelper { 
                pm.getDexOptHelper().new DexoptDoneHandler());

        LocalManagerRegistry.addManager(ArtManagerLocal.class, artManager);



        // Schedule the background job when boot is complete. This decouples us from when

        // JobSchedulerService is initialized.

        systemContext.registerReceiver(new BroadcastReceiver() {

            @Override

            public void onReceive(Context context, Intent intent) {

                context.unregisterReceiver(this);

                artManager.scheduleBackgroundDexoptJob();

            }

        }, new IntentFilter(Intent.ACTION_BOOT_COMPLETED));

    }



    /**

     * Returns the registered {@link ArtManagerLocal} instance, or else throws an unchecked error.

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

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

        t.traceEnd();



        t.traceBegin("ArtManagerLocal");

        DexOptHelper.initializeArtManagerLocal(context, mPackageManagerService);

        t.traceEnd();



        t.traceBegin("UpdatePackagesIfNeeded");

        try {

            Watchdog.getInstance().pauseWatchingCurrentThread("dexopt");
@@ -2766,10 +2770,6 @@ public final class SystemServer implements Dumpable { 
        mSystemServiceManager.startService(PermissionPolicyService.class);

        t.traceEnd();



        t.traceBegin("ArtManagerLocal");

        DexOptHelper.initializeArtManagerLocal(context, mPackageManagerService);

        t.traceEnd();



        t.traceBegin("MakePackageManagerServiceReady");

        mPackageManagerService.systemReady();

        t.traceEnd();