diff options
| author | Artur Satayev <satayev@google.com> | 2022-02-10 15:41:58 +0000 |
|---|---|---|
| committer | Artur Satayev <satayev@google.com> | 2022-02-10 15:42:19 +0000 |
| commit | fd500e7bb13f42e8f95ebcad9998fa91c14a4ba0 (patch) | |
| tree | 8728aa3ef3bd16d0fbf3e9b98b2a86137d7b650f /services/java/com/android/server/SystemServer.java | |
| parent | 1e0219774fc519f412c824756f036335752d8dc1 (diff) | |
Revert "Move Scheduling system service into apex manifest."
This reverts commit 1e0219774fc519f412c824756f036335752d8dc1.
Reason for revert: we need explicit declaration in SystemServer for non-mainline devices since they use flattened apex
Fix: 215565746
Test: presubmit
Change-Id: Ie0cbe03c21a18a185df54a9cd9b9a2ff1ae6f821
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 14008c321616..bd790baae912 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -261,6 +261,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 = @@ -2543,6 +2547,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); |