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

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

Change-Id: I59ded441ee7ac43ec7876e062e9a3b01b9c873ae
This commit is contained in:
Neha Pattan
2022-03-09 23:52:50 +00:00
committed by Automerger Merge Worker

View File

@@ -423,6 +423,8 @@ public final class SystemServer implements Dumpable {
private static final String SDK_SANDBOX_MANAGER_SERVICE_CLASS =
"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";
@@ -2608,6 +2610,11 @@ public final class SystemServer implements Dumpable {
mSystemServiceManager.startService(SDK_SANDBOX_MANAGER_SERVICE_CLASS);
t.traceEnd();
// AdServicesManagerService (PP API service)
t.traceBegin("StartAdServicesManagerService");
mSystemServiceManager.startService(AD_SERVICES_MANAGER_SERVICE_CLASS);
t.traceEnd();
if (safeMode) {
mActivityManagerService.enterSafeMode();
}