diff options
| author | Roopa Sattiraju <sattiraju@google.com> | 2022-02-03 09:07:17 -0800 |
|---|---|---|
| committer | Roopa Sattiraju <sattiraju@google.com> | 2022-02-24 20:42:33 +0000 |
| commit | 293ed88b2f507755d5de4e64b5f074be9b01406f (patch) | |
| tree | 46688ab0fa18d75bec821c7711ed263481d7fb58 /services/java/com/android/server/SystemServer.java | |
| parent | b031e081040aa1e95fdaf9620e4c7894c476dc18 (diff) | |
Enabling Apex in BT
Bug: 217736913
Test: Compile, bringup and test user journeys
Change-Id: I3e796e3618ad9a077fa5e8ac387e314e896d1051
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index e895d377f607..d58a3bbe633f 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -415,10 +415,12 @@ public final class SystemServer implements Dumpable { private static final String UWB_APEX_SERVICE_JAR_PATH = "/apex/com.android.uwb/javalib/service-uwb.jar"; private static final String UWB_SERVICE_CLASS = "com.android.server.uwb.UwbService"; - private static final String SAFETY_CENTER_SERVICE_CLASS = - "com.android.safetycenter.SafetyCenterService"; + private static final String BLUETOOTH_APEX_SERVICE_JAR_PATH = + "/apex/com.android.bluetooth/javalib/service-bluetooth.jar"; private static final String BLUETOOTH_SERVICE_CLASS = "com.android.server.bluetooth.BluetoothService"; + private static final String SAFETY_CENTER_SERVICE_CLASS = + "com.android.safetycenter.SafetyCenterService"; private static final String SUPPLEMENTALPROCESS_SERVICE_CLASS = "com.android.server.supplementalprocess.SupplementalProcessManagerService$Lifecycle"; @@ -1626,7 +1628,8 @@ public final class SystemServer implements Dumpable { Slog.i(TAG, "No Bluetooth Service (Bluetooth Hardware Not Present)"); } else { t.traceBegin("StartBluetoothService"); - mSystemServiceManager.startService(BLUETOOTH_SERVICE_CLASS); + mSystemServiceManager.startServiceFromJar(BLUETOOTH_SERVICE_CLASS, + BLUETOOTH_APEX_SERVICE_JAR_PATH); t.traceEnd(); } |