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

Commit 3e3d9093 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "[bt] Add the Google module in pixel image" into main am: b43d40d6 

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



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

boot/Android.bp

+2 −2
Original line number Original line Diff line number Diff line
@@ -75,8 +75,8 @@ custom_platform_bootclasspath { 
            module: "art-bootclasspath-fragment",

            module: "art-bootclasspath-fragment",

        },

        },

        {

        {

            apex: "com.android.btservices",

            apex: "com.android.bt",

            module: "com.android.btservices-bootclasspath-fragment",

            module: "com.android.bt-bootclasspath-fragment",

        },

        },

        {

        {

            apex: "com.android.configinfrastructure",

            apex: "com.android.configinfrastructure",

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -428,7 +428,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.btservices/javalib/service-bluetooth.jar";

            "/apex/com.android.bt/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 DEVICE_LOCK_SERVICE_CLASS =

    private static final String DEVICE_LOCK_SERVICE_CLASS =