Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73e564fe authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Change Bluetooth apex mountpoint" into tm-dev am: 7a1c7017 am: a506d19b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19038084



Change-Id: I8fb452c5d9aef764141685fef00de87cb26246b4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c58e4395 a506d19b

boot/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -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",

services/java/com/android/server/SystemServer.java

+1 −1
Original line number Diff line number Diff line
@@ -409,7 +409,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 =