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

This commit is contained in:
TreeHugger Robot
2022-02-10 17:40:10 +00:00
committed by Android (Google) Code Review

View File

@@ -264,6 +264,10 @@ public final class SystemServer implements Dumpable {
"com.android.server.companion.virtual.VirtualDeviceManagerService";
private static final String STATS_COMPANION_APEX_PATH =
"/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 =
"/apex/com.android.tethering/javalib/service-connectivity.jar";
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);
t.traceEnd();
// Reboot Readiness
t.traceBegin("StartRebootReadinessManagerService");
mSystemServiceManager.startServiceFromJar(
REBOOT_READINESS_LIFECYCLE_CLASS, SCHEDULING_APEX_PATH);
t.traceEnd();
// Statsd pulled atoms
t.traceBegin("StartStatsPullAtomService");
mSystemServiceManager.startService(STATS_PULL_ATOM_SERVICE_CLASS);