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

Commit 8e43739f authored by Neha Pattan's avatar Neha Pattan Committed by Automerger Merge Worker
Browse files

Merge "Start system service for AdServices." into tm-dev am: dcdb94e3 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17109672

Change-Id: I156f41a1f7cb73e41c490ee71b3f8516278e57f4
parents 3aeb3e66 dcdb94e3

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

+7 −0
Original line number Original line Diff line number Diff line
@@ -423,6 +423,8 @@ public final class SystemServer implements Dumpable { 




    private static final String SDK_SANDBOX_MANAGER_SERVICE_CLASS =

    private static final String SDK_SANDBOX_MANAGER_SERVICE_CLASS =

            "com.android.server.sdksandbox.SdkSandboxManagerService$Lifecycle";

            "com.android.server.sdksandbox.SdkSandboxManagerService$Lifecycle";

    private static final String AD_SERVICES_MANAGER_SERVICE_CLASS =

            "com.android.server.adservices.AdServicesManagerService$Lifecycle";





    private static final String TETHERING_CONNECTOR_CLASS = "android.net.ITetheringConnector";

    private static final String TETHERING_CONNECTOR_CLASS = "android.net.ITetheringConnector";
@@ -2608,6 +2610,11 @@ public final class SystemServer implements Dumpable { 
        mSystemServiceManager.startService(SDK_SANDBOX_MANAGER_SERVICE_CLASS);

        mSystemServiceManager.startService(SDK_SANDBOX_MANAGER_SERVICE_CLASS);

        t.traceEnd();

        t.traceEnd();





        // AdServicesManagerService (PP API service)

        t.traceBegin("StartAdServicesManagerService");

        mSystemServiceManager.startService(AD_SERVICES_MANAGER_SERVICE_CLASS);

        t.traceEnd();



        if (safeMode) {

        if (safeMode) {

            mActivityManagerService.enterSafeMode();

            mActivityManagerService.enterSafeMode();

        }

        }