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

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

Merge "Use a separate timing tracer for DexUseManagerLocal."

parents ded54efd 78ba6053

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

+6 −3
Original line number Diff line number Diff line
@@ -1228,16 +1228,19 @@ public final class SystemServer implements Dumpable { 
            Watchdog.getInstance().resumeWatchingCurrentThread("packagemanagermain");

        }



        mFirstBoot = mPackageManagerService.isFirstBoot();

        mPackageManager = mSystemContext.getPackageManager();

        t.traceEnd();



        t.traceBegin("DexUseManagerLocal");

        // DexUseManagerLocal needs to be loaded after PackageManagerLocal has been registered, but

        // before PackageManagerService starts processing binder calls to notifyDexLoad.

        // DexUseManagerLocal may also call artd, so ensure ArtModuleServiceManager is instantiated.

        ArtModuleServiceInitializer.setArtModuleServiceManager(new ArtModuleServiceManager());

        LocalManagerRegistry.addManager(

                DexUseManagerLocal.class, DexUseManagerLocal.createInstance());



        mFirstBoot = mPackageManagerService.isFirstBoot();

        mPackageManager = mSystemContext.getPackageManager();

        t.traceEnd();



        if (!mRuntimeRestart && !isFirstBootOrUpgrade()) {

            FrameworkStatsLog.write(FrameworkStatsLog.BOOT_TIME_EVENT_ELAPSED_TIME_REPORTED,

                    FrameworkStatsLog