Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Move Scheduling system service into apex manifest."

Browse Source 
This reverts commit 1e0219774f.

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
This commit is contained in:
Artur Satayev
2022-02-10 15:41:58 +00:00
parent 1e0219774f
commit fd500e7bb1
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/java/com/android/server/SystemServer.java
View File

@@ -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);