summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author William Escande <wescande@google.com> 2022-06-22 13:19:14 -0700
committer William Escande <wescande@google.com> 2022-06-22 13:19:14 -0700
commit7b012e937e57bf7171472c6f63263ab42f53508e (patch)
tree7468438f6fac267a37195219cbb785ed6d025785
parent75c201f935a391f3cb6cb3ea843b26a5d7f0e404 (diff)
Change Bluetooth apex mountpoint
Apex name has been changed to com.android.btservices Changing mount point accordingly Bug: 235892590 Test: Flash / boot bt / look logs & pair a device Change-Id: I8cff5f6449ee19466b3df571a40e062964a9e46c
-rw-r--r--boot/Android.bp4
-rw-r--r--services/java/com/android/server/SystemServer.java2
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 =