Add service-supplementalprocess to combined_apis
Test: m
Bug: 212577961
Change-Id: Id05c53612ec5a6fe9abeaed441da5c8b164844ce
diff --git a/api/Android.bp b/api/Android.bp
index 362f39f..a22c2f6 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -133,6 +133,7 @@
system_server_classpath: [
"service-media-s",
"service-permission",
+ "service-supplementalprocess",
],
}
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index ee8288e..5586700 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -409,8 +409,6 @@
private static final String SAFETY_CENTER_SERVICE_CLASS =
"com.android.safetycenter.SafetyCenterService";
- private static final String SUPPLEMENTALPROCESS_APEX_PATH =
- "/apex/com.android.supplementalprocess/javalib/service-supplementalprocess.jar";
private static final String SUPPLEMENTALPROCESS_SERVICE_CLASS =
"com.android.server.supplementalprocess.SupplementalProcessManagerService$Lifecycle";
@@ -2570,8 +2568,7 @@
// Supplemental Process
t.traceBegin("StartSupplementalProcessManagerService");
- mSystemServiceManager.startServiceFromJar(SUPPLEMENTALPROCESS_SERVICE_CLASS,
- SUPPLEMENTALPROCESS_APEX_PATH);
+ mSystemServiceManager.startService(SUPPLEMENTALPROCESS_SERVICE_CLASS);
t.traceEnd();
if (safeMode) {