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

Commit 3a2da917 authored by Rongxuan Liu's avatar Rongxuan Liu Committed by Automerger Merge Worker
Browse files

Merge "[le audio] Update BIS state check" into main am: e5ae7368 am: 5e048329 

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



Change-Id: I1d74f071383264bedb8708c3663d6213c0a4857e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b000c747 5e048329

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

+9 −20
Original line number Diff line number Diff line
@@ -3928,10 +3928,7 @@ public class BassClientService extends ProfileService { 
        for (BluetoothDevice device : devices) {

            for (BluetoothLeBroadcastReceiveState receiveState : getAllSources(device)) {

                for (int i = 0; i < receiveState.getNumSubgroups(); i++) {

                    Long syncState = receiveState.getBisSyncState().get(i);

                    /* Synced to BIS */

                    if (syncState != BassConstants.BIS_SYNC_NOT_SYNC_TO_BIS

                            && syncState != BassConstants.BIS_SYNC_FAILED_SYNC_TO_BIG) {

                    if (isSyncedToBroadcastStream(receiveState.getBisSyncState().get(i))) {

                        return true;

                    }

                }
@@ -3948,10 +3945,7 @@ public class BassClientService extends ProfileService { 
        for (BluetoothDevice device : devices) {

            for (BluetoothLeBroadcastReceiveState receiveState : getAllSources(device)) {

                for (int i = 0; i < receiveState.getNumSubgroups(); i++) {

                    Long syncState = receiveState.getBisSyncState().get(i);

                    /* Synced to BIS */

                    if (syncState != BassConstants.BIS_SYNC_NOT_SYNC_TO_BIS

                            && syncState != BassConstants.BIS_SYNC_FAILED_SYNC_TO_BIG) {

                    if (isSyncedToBroadcastStream(receiveState.getBisSyncState().get(i))) {

                        if (isLocalBroadcast(receiveState)) {

                            return false;

                        } else {
@@ -3981,10 +3975,7 @@ public class BassClientService extends ProfileService { 
            return true;

        } else {

            for (int i = 0; i < receiveState.getNumSubgroups(); i++) {

                Long syncState = receiveState.getBisSyncState().get(i);

                /* Synced to BIS */

                if (syncState != BassConstants.BIS_SYNC_NOT_SYNC_TO_BIS

                        && syncState != BassConstants.BIS_SYNC_FAILED_SYNC_TO_BIG) {

                if (isSyncedToBroadcastStream(receiveState.getBisSyncState().get(i))) {

                    return true;

                }

            }
@@ -4034,14 +4025,7 @@ public class BassClientService extends ProfileService { 
                        .anyMatch(

                                receiveState ->

                                        (receiveState.getBisSyncState().stream()

                                                .anyMatch(

                                                        syncState ->

                                                                syncState

                                                                                != BassConstants

                                                                                        .BIS_SYNC_NOT_SYNC_TO_BIS

                                                                        && syncState

                                                                                != BassConstants

                                                                                        .BIS_SYNC_FAILED_SYNC_TO_BIG)))) {

                                                .anyMatch(this::isSyncedToBroadcastStream)))) {

                    activeSinks.add(device);

                }

            }
@@ -4049,6 +4033,11 @@ public class BassClientService extends ProfileService { 
        return activeSinks;

    }



    private boolean isSyncedToBroadcastStream(Long syncState) {

        return syncState != BassConstants.BIS_SYNC_NOT_SYNC_TO_BIS

                && syncState != BassConstants.BIS_SYNC_FAILED_SYNC_TO_BIG;

    }



    /** Handle broadcast state changed */

    public void notifyBroadcastStateChanged(int state, int broadcastId) {

        switch (state) {