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

Commit 4c1d1797 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "Move Scheduling system service into apex manifest.""

parents 7f7d6185 fd500e7b

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

+10 −0
Original line number Original line Diff line number Diff line
@@ -264,6 +264,10 @@ public final class SystemServer implements Dumpable { 
            "com.android.server.companion.virtual.VirtualDeviceManagerService";

            "com.android.server.companion.virtual.VirtualDeviceManagerService";

    private static final String STATS_COMPANION_APEX_PATH =

    private static final String STATS_COMPANION_APEX_PATH =

            "/apex/com.android.os.statsd/javalib/service-statsd.jar";

            "/apex/com.android.os.statsd/javalib/service-statsd.jar";

    private static final String SCHEDULING_APEX_PATH =

            "/apex/com.android.scheduling/javalib/service-scheduling.jar";

    private static final String REBOOT_READINESS_LIFECYCLE_CLASS =

            "com.android.server.scheduling.RebootReadinessManagerService$Lifecycle";

    private static final String CONNECTIVITY_SERVICE_APEX_PATH =

    private static final String CONNECTIVITY_SERVICE_APEX_PATH =

            "/apex/com.android.tethering/javalib/service-connectivity.jar";

            "/apex/com.android.tethering/javalib/service-connectivity.jar";

    private static final String STATS_COMPANION_LIFECYCLE_CLASS =

    private static final String STATS_COMPANION_LIFECYCLE_CLASS =
@@ -2575,6 +2579,12 @@ public final class SystemServer implements Dumpable { 
                STATS_COMPANION_LIFECYCLE_CLASS, STATS_COMPANION_APEX_PATH);

                STATS_COMPANION_LIFECYCLE_CLASS, STATS_COMPANION_APEX_PATH);

        t.traceEnd();

        t.traceEnd();





        // Reboot Readiness

        t.traceBegin("StartRebootReadinessManagerService");

        mSystemServiceManager.startServiceFromJar(

                REBOOT_READINESS_LIFECYCLE_CLASS, SCHEDULING_APEX_PATH);

        t.traceEnd();



        // Statsd pulled atoms

        // Statsd pulled atoms

        t.traceBegin("StartStatsPullAtomService");

        t.traceBegin("StartStatsPullAtomService");

        mSystemServiceManager.startService(STATS_PULL_ATOM_SERVICE_CLASS);

        mSystemServiceManager.startService(STATS_PULL_ATOM_SERVICE_CLASS);