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

Commit 992da60b 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: ad8640ee

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



Change-Id: I95a04705ca52eb3fca77a41d2b4601e342d2f909
Ignore-AOSP-First: this is an automerge
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 70c8a80e ad8640ee

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