Merge changes from topic "uwb_aosp_service" into sc-dev am: 9bed14ecc8

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

Change-Id: I29d48ed2e4bd3333b9319e4f2c4fb9809d870151
This commit is contained in:
Roshan Pius
2021-04-14 03:42:09 +00:00
committed by Automerger Merge Worker
9 changed files with 714 additions and 3 deletions

View File

@@ -384,6 +384,7 @@ public final class SystemServer implements Dumpable {
private static final String ROLE_SERVICE_CLASS = "com.android.role.RoleService";
private static final String GAME_MANAGER_SERVICE_CLASS =
"com.android.server.app.GameManagerService$Lifecycle";
private static final String UWB_SERVICE_CLASS = "com.android.server.uwb.UwbService";
private static final String TETHERING_CONNECTOR_CLASS = "android.net.ITetheringConnector";
@@ -2657,6 +2658,12 @@ public final class SystemServer implements Dumpable {
LocalManagerRegistry.addManager(ArtManagerLocal.class, new ArtManagerLocal());
t.traceEnd();
if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_UWB)) {
t.traceBegin("UwbService");
mSystemServiceManager.startService(UWB_SERVICE_CLASS);
t.traceEnd();
}
t.traceBegin("StartBootPhaseDeviceSpecificServicesReady");
mSystemServiceManager.startBootPhase(t, SystemService.PHASE_DEVICE_SPECIFIC_SERVICES_READY);
t.traceEnd();