diff options
| author | 2022-06-23 10:51:30 +0000 | |
|---|---|---|
| committer | 2022-06-23 10:51:30 +0000 | |
| commit | a9abf3ce77c9b04fe9be6dc9d1f678e4706ddd6c (patch) | |
| tree | a6091aa38d3e4b43876276c66b95b5c4a45285ac | |
| parent | 630304370cbf8311d1086a2301568495c4d91b44 (diff) | |
| parent | 183bba2187975bd4d10f68ddcc2698fbcd10d2b5 (diff) | |
Merge "Change Bluetooth apex mountpoint" into tm-dev am: 7a1c701712 am: 183bba2187
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19038084
Change-Id: I116254e4e466c2b24ab5301bd5ce115582aa3725
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | boot/Android.bp | 4 | ||||
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/boot/Android.bp b/boot/Android.bp index 5b265a5dc9de..3f14ebc4fd92 100644 --- a/boot/Android.bp +++ b/boot/Android.bp @@ -60,8 +60,8 @@ platform_bootclasspath { module: "art-bootclasspath-fragment", }, { - apex: "com.android.bluetooth", - module: "com.android.bluetooth-bootclasspath-fragment", + apex: "com.android.btservices", + module: "com.android.btservices-bootclasspath-fragment", }, { apex: "com.android.conscrypt", diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index ef311c249c5f..66c9f55b0403 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -412,7 +412,7 @@ public final class SystemServer implements Dumpable { "/apex/com.android.uwb/javalib/service-uwb.jar"; private static final String UWB_SERVICE_CLASS = "com.android.server.uwb.UwbService"; private static final String BLUETOOTH_APEX_SERVICE_JAR_PATH = - "/apex/com.android.bluetooth/javalib/service-bluetooth.jar"; + "/apex/com.android.btservices/javalib/service-bluetooth.jar"; private static final String BLUETOOTH_SERVICE_CLASS = "com.android.server.bluetooth.BluetoothService"; private static final String SAFETY_CENTER_SERVICE_CLASS = |