Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change Bluetooth apex mountpoint" into tm-dev am: 7a1c701712 am: 183bba2187

Browse Source 
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>
This commit is contained in:
TreeHugger Robot
2022-06-23 10:51:30 +00:00
committed by Automerger Merge Worker
parent 630304370c 183bba2187
commit a9abf3ce77
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
boot/Android.bp
View File

@@ -60,8 +60,8 @@ platform_bootclasspath {
module: "art-bootclasspath-fragment", module: "art-bootclasspath-fragment",
}, },
{ {
apex: "com.android.bluetooth", apex: "com.android.btservices",
module: "com.android.bluetooth-bootclasspath-fragment", module: "com.android.btservices-bootclasspath-fragment",
}, },
{ {
apex: "com.android.conscrypt", apex: "com.android.conscrypt",

2
services/java/com/android/server/SystemServer.java
View File

@@ -412,7 +412,7 @@ public final class SystemServer implements Dumpable {
"/apex/com.android.uwb/javalib/service-uwb.jar"; "/apex/com.android.uwb/javalib/service-uwb.jar";
private static final String UWB_SERVICE_CLASS = "com.android.server.uwb.UwbService"; private static final String UWB_SERVICE_CLASS = "com.android.server.uwb.UwbService";
private static final String BLUETOOTH_APEX_SERVICE_JAR_PATH = 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 = private static final String BLUETOOTH_SERVICE_CLASS =
"com.android.server.bluetooth.BluetoothService"; "com.android.server.bluetooth.BluetoothService";
private static final String SAFETY_CENTER_SERVICE_CLASS = private static final String SAFETY_CENTER_SERVICE_CLASS =