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

Commit a6d93a52 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Change isCISCentralSupported() to isLeAudioSupported() API" am:... 

Merge "Change isCISCentralSupported() to isLeAudioSupported() API" am: 83b6a135 am: d31eeaf6 am: edbdae04

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

Change-Id: I5c8a3148ac3d88a85b94c0e659924bbaff0a5992
parents f3c0d59a edbdae04

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+6 −2
Original line number Diff line number Diff line
@@ -2422,13 +2422,17 @@ public class AdapterService extends Service { 
        }



        @Override

        public int isCisCentralSupported() {

        public int isLeAudioSupported() {

            AdapterService service = getService();

            if (service == null) {

                return BluetoothStatusCodes.ERROR_BLUETOOTH_NOT_ENABLED;

            }



            if (service.mAdapterProperties.isLeConnectedIsochronousStreamCentralSupported()) {

            HashSet<Class> supportedProfileServices =

                    new HashSet<Class>(Arrays.asList(Config.getSupportedProfiles()));

            HashSet<Class> leAudioUnicastProfiles = Config.geLeAudioUnicastProfiles();



            if (supportedProfileServices.containsAll(leAudioUnicastProfiles)) {

                return BluetoothStatusCodes.SUCCESS;

            }

system/binder/android/bluetooth/IBluetooth.aidl

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ interface IBluetooth 
    @JavaPassthrough(annotation="@android.annotation.RequiresNoPermission")

    boolean isLePeriodicAdvertisingSupported();

    @JavaPassthrough(annotation="@android.annotation.RequiresNoPermission")

    int isCisCentralSupported();

    int isLeAudioSupported();

    @JavaPassthrough(annotation="@android.annotation.RequiresNoPermission")

    int isLePeriodicAdvertisingSyncTransferSenderSupported();

    @JavaPassthrough(annotation="@android.annotation.RequiresNoPermission")