summaryrefslogtreecommitdiff
path: root/services/java/com/android
diff options
context:
space:
mode:
authorRoshan Pius <rpius@google.com>2021-04-14 03:42:09 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-04-14 03:42:09 +0000
commit18b8ca3e6b6239a1ae0995bfb08bebb227d79549 (patch)
tree3819a767f0feedc462c8406d34e18df78bccf4a4 /services/java/com/android
parent2544369e9ec7a47e793a077ba9545819cc006a10 (diff)
parent9bed14ecc8ac297eed31153cc420213179506a3e (diff)
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
Diffstat (limited to 'services/java/com/android')
-rw-r--r--services/java/com/android/server/SystemServer.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 04e1e8a1fb54..caceeb33c6b5 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -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();