Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23c2c9ec authored by Nikita Ioffe's avatar Nikita Ioffe Committed by Android (Google) Code Review
Browse files

Merge "Add service-supplementalprocess to combined_apis"

parents dbcb097a e48d2010

api/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ combined_apis { 
    system_server_classpath: [

        "service-media-s",

        "service-permission",

        "service-supplementalprocess",

    ],

}

services/java/com/android/server/SystemServer.java

+1 −4
Original line number Diff line number Diff line
@@ -403,8 +403,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";
@@ -2558,8 +2556,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) {