From e48d20105323b0a9f10e4e2e0c4aac4ec677798f Mon Sep 17 00:00:00 2001
From: Nikita Ioffe <ioffe@google.com>
Date: Mon, 17 Jan 2022 20:38:40 +0000
Subject: [PATCH] Add service-supplementalprocess to combined_apis

Test: m
Bug: 212577961
Change-Id: Id05c53612ec5a6fe9abeaed441da5c8b164844ce
---
 api/Android.bp                                     | 1 +
 services/java/com/android/server/SystemServer.java | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/api/Android.bp b/api/Android.bp
index 362f39f2beaf4..a22c2f6af35a7 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -133,6 +133,7 @@ combined_apis {
     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 ee8288e3b2df7..5586700438194 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -409,8 +409,6 @@ public final class SystemServer implements Dumpable {
     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 @@ public final class SystemServer implements Dumpable {
 
         // Supplemental Process
         t.traceBegin("StartSupplementalProcessManagerService");
-        mSystemServiceManager.startServiceFromJar(SUPPLEMENTALPROCESS_SERVICE_CLASS,
-                SUPPLEMENTALPROCESS_APEX_PATH);
+        mSystemServiceManager.startService(SUPPLEMENTALPROCESS_SERVICE_CLASS);
         t.traceEnd();
 
         if (safeMode) {