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

Commit 0df804cb authored by Rongxuan Liu's avatar Rongxuan Liu Committed by Automerger Merge Worker
Browse files

Merge "le_audio: Disable Sound Effects for active Broadcast Assistant" into main am: 310cf99d 

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



Change-Id: Icd97a2761b68118085458d2039570db7834ff6d5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9aa721b9 310cf99d

android/app/src/com/android/bluetooth/bass_client/BassClientService.java

+50 −17
Original line number Diff line number Diff line
@@ -878,9 +878,45 @@ public class BassClientService extends ProfileService { 
                && (leAudioService.getActiveDevices().contains(device));

    }



    private boolean isAnyDeviceFromActiveUnicastGroupReceivingBroadcast() {

        return getActiveBroadcastSinks().stream()

                .anyMatch(d -> isDevicePartOfActiveUnicastGroup(d));

    private boolean isEmptyBluetoothDevice(BluetoothDevice device) {

        if (device == null) {

            Log.e(TAG, "Device is null!");

            return true;

        }



        return device.getAddress().equals("00:00:00:00:00:00");

    }



    private boolean hasAnyConnectedDeviceExternalBroadcastSource() {

        for (BluetoothDevice device : getConnectedDevices()) {

            // Check if any connected device has add some source

            if (getAllSources(device).stream()

                    .anyMatch(

                            receiveState ->

                                    (!isEmptyBluetoothDevice(receiveState.getSourceDevice())

                                            && !isLocalBroadcast(receiveState)))) {

                return true;

            }

        }



        return false;

    }



    private void checkAndResetGroupAllowedContextMask() {

        LeAudioService leAudioService = mServiceFactory.getLeAudioService();

        if (leAudioService == null) {

            return;

        }



        if (leaudioAllowedContextMask()) {

            /* Restore allowed context mask for Unicast */

            if (mIsAllowedContextOfActiveGroupModified

                    && !hasAnyConnectedDeviceExternalBroadcastSource()) {

                leAudioService.setActiveGroupAllowedContextMask(

                        BluetoothLeAudio.CONTEXTS_ALL, BluetoothLeAudio.CONTEXTS_ALL);

                mIsAllowedContextOfActiveGroupModified = false;

            }

        }

    }



    private void localNotifyReceiveStateChanged(BluetoothDevice sink) {
@@ -918,16 +954,10 @@ public class BassClientService extends ProfileService { 
                leAudioService.activeBroadcastAssistantNotification(false);

            }



            if (leaudioAllowedContextMask()) {

                /* Restore allowed context mask for active device */

                if (mIsAllowedContextOfActiveGroupModified) {

                    if (!isAnyDeviceFromActiveUnicastGroupReceivingBroadcast()) {

                        leAudioService.setActiveGroupAllowedContextMask(

                                BluetoothLeAudio.CONTEXTS_ALL, BluetoothLeAudio.CONTEXTS_ALL);

                    }

                    mIsAllowedContextOfActiveGroupModified = false;

                }

            }

            /* Restore allowed context mask for unicast in case if last connected broadcast

             * delegator device which has external source removes this source

             */

            checkAndResetGroupAllowedContextMask();

        }

    }
@@ -1074,9 +1104,8 @@ public class BassClientService extends ProfileService { 
            return false;

        }

        boolean isRoomAvailable = false;

        String emptyBluetoothDevice = "00:00:00:00:00:00";

        for (BluetoothLeBroadcastReceiveState recvState : stateMachine.getAllSources()) {

            if (recvState.getSourceDevice().getAddress().equals(emptyBluetoothDevice)) {

            if (isEmptyBluetoothDevice(recvState.getSourceDevice())) {

                isRoomAvailable = true;

                break;

            }
@@ -1348,6 +1377,11 @@ public class BassClientService extends ProfileService { 
                log("Unbonded " + device + ". Removing state machine");

                removeStateMachine(device);

            }



            /* Restore allowed context mask for unicast in case if last connected broadcast

             * delegator device which has external source disconnectes.

             */

            checkAndResetGroupAllowedContextMask();

        } else if (toState == BluetoothProfile.STATE_CONNECTED) {

            handleReconnectingAudioSharingModeDevice(device);

        }
@@ -2730,8 +2764,7 @@ public class BassClientService extends ProfileService { 
            List<BluetoothLeBroadcastReceiveState> recvStates =

                    new ArrayList<BluetoothLeBroadcastReceiveState>();

            for (BluetoothLeBroadcastReceiveState rs : stateMachine.getAllSources()) {

                String emptyBluetoothDevice = "00:00:00:00:00:00";

                if (!rs.getSourceDevice().getAddress().equals(emptyBluetoothDevice)) {

                if (!isEmptyBluetoothDevice(rs.getSourceDevice())) {

                    recvStates.add(rs);

                }

            }