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

Commit f4ef9d89 authored by Sal Savage's avatar Sal Savage Committed by Automerger Merge Worker
Browse files

Merge "Update LE Audio profile enable property names to be in line with spec"... 

Merge "Update LE Audio profile enable property names to be in line with spec" into tm-dev am: af782a56 am: 9ad33d00

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/17650986



Change-Id: I1a0b5c4e03a66c2d18705b8c3d4f5862cb2ac749
Ignore-AOSP-First: this is an automerge
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bcb244a4 9ad33d00

android/app/src/com/android/bluetooth/le_audio/LeAudioService.java

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ public class LeAudioService extends ProfileService { 
    }



    public static boolean isEnabled() {

        return BluetoothProperties.isProfileBapUnicastServerEnabled().orElse(false);

        return BluetoothProperties.isProfileBapUnicastClientEnabled().orElse(false);

    }



    @Override

android/app/src/com/android/bluetooth/tbs/TbsService.java

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ public class TbsService extends ProfileService { 
    private final TbsGeneric mTbsGeneric = new TbsGeneric();



    public static boolean isEnabled() {

        return BluetoothProperties.isProfileTbsServerEnabled().orElse(false);

        return BluetoothProperties.isProfileCcpServerEnabled().orElse(false);

    }



    @Override

android/app/src/com/android/bluetooth/vc/VolumeControlService.java

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ public class VolumeControlService extends ProfileService { 
    private final ServiceFactory mFactory = new ServiceFactory();



    public static boolean isEnabled() {

        return BluetoothProperties.isProfileVcServerEnabled().orElse(false);

        return BluetoothProperties.isProfileVcpControllerEnabled().orElse(false);

    }



    @Override