diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-06-23 10:21:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-06-23 10:21:35 +0000 |
| commit | 7a1c7017127519ead880294f1c674aa7dce39844 (patch) | |
| tree | 4ff491c261c430f6ec8bfebfba651742eb79b191 | |
| parent | 37e033dbc3f2a14c843c880919ea6277499834e5 (diff) | |
| parent | 7b012e937e57bf7171472c6f63263ab42f53508e (diff) | |
| download | base-7a1c7017127519ead880294f1c674aa7dce39844.tar.gz | |
Merge "Change Bluetooth apex mountpoint" into tm-dev
| -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 = |