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

Commit ec9d1d10 authored by David Duarte's avatar David Duarte Committed by Automerger Merge Worker
Browse files

Merge changes Id1d283a3,I3d228b93 into main am: 49aaa965 

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



Change-Id: Ia80dcfe96c5ceb09286a74ceb663ec968a15dd7e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 091c5860 49aaa965

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

+0 −67
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ import java.util.ArrayList; 
import java.util.Arrays;

import java.util.Collections;

import java.util.HashMap;

import java.util.LinkedList;

import java.util.List;

import java.util.Map;

import java.util.Objects;
@@ -91,9 +90,6 @@ public class BassClientService extends ProfileService { 
            new ConcurrentHashMap<>();

    private final Map<BluetoothDevice, List<Integer>> mActiveSourceMap = new ConcurrentHashMap<>();

    private final FeatureFlags mFeatureFlags;

    private final Map<BluetoothDevice, BluetoothLeBroadcastMetadata> mBroadcastMetadataMap =

            new ConcurrentHashMap<>();

    private final LinkedList<BluetoothDevice> mPausedBroadcastSinks = new LinkedList<>();



    private HandlerThread mStateMachinesThread;

    private HandlerThread mCallbackHandlerThread;
@@ -428,9 +424,6 @@ public class BassClientService extends ProfileService { 
        if (mCachedBroadcasts != null) {

            mCachedBroadcasts.clear();

        }

        if (mBroadcastMetadataMap != null) {

            mBroadcastMetadataMap.clear();

        }

        if (mSyncHandleToBroadcastIdMap != null) {

            mSyncHandleToBroadcastIdMap.clear();

            mSyncHandleToBroadcastIdMap = null;
@@ -1217,9 +1210,6 @@ public class BassClientService extends ProfileService { 
            return;

        }



        /* Store metadata for sink device */

        mBroadcastMetadataMap.put(sink, sourceMetadata);



        byte[] code = sourceMetadata.getBroadcastCode();

        for (BluetoothDevice device : devices) {

            BassClientStateMachine stateMachine = getOrCreateStateMachine(device);
@@ -1311,9 +1301,6 @@ public class BassClientService extends ProfileService { 
            return;

        }



        /* Update metadata for sink device */

        mBroadcastMetadataMap.put(sink, updatedMetadata);



        byte[] code = updatedMetadata.getBroadcastCode();

        for (Map.Entry<BluetoothDevice, Integer> deviceSourceIdPair : devices.entrySet()) {

            BluetoothDevice device = deviceSourceIdPair.getKey();
@@ -1392,12 +1379,6 @@ public class BassClientService extends ProfileService { 
            BluetoothDevice device = deviceSourceIdPair.getKey();

            Integer deviceSourceId = deviceSourceIdPair.getValue();

            BassClientStateMachine stateMachine = getOrCreateStateMachine(device);



            /* Removes metadata for sink device if not paused */

            if (!mPausedBroadcastSinks.contains(device)) {

                mBroadcastMetadataMap.remove(device);

            }



            if (stateMachine == null) {

                log("removeSource: Error bad parameters: device = " + device);

                mCallbacks.notifySourceRemoveFailed(device, sourceId,
@@ -1529,54 +1510,6 @@ public class BassClientService extends ProfileService { 
        }

    }



    private void stopLocalSourceReceivers(int broadcastId, boolean store) {

        if (DBG) {

            Log.d(TAG, "stopLocalSourceReceivers()");

        }



        if (store && !mPausedBroadcastSinks.isEmpty()) {

            Log.w(TAG, "stopLocalSourceReceivers(), paused broadcast sinks are replaced");

            mPausedBroadcastSinks.clear();

        }



        for (BluetoothDevice device : getConnectedDevices()) {

            for (BluetoothLeBroadcastReceiveState receiveState : getAllSources(device)) {

                /* Check if local/last broadcast is the synced one */

                if (receiveState.getBroadcastId() != broadcastId) continue;



                removeSource(device, receiveState.getSourceId());



                if (store && !mPausedBroadcastSinks.contains(device)) {

                    mPausedBroadcastSinks.add(device);

                }

            }

        }

    }



    /** Request receivers to suspend broadcast sources synchronization */

    public void suspendReceiversSourceSynchronization(int broadcastId) {

        sEventLogger.logd(DBG, TAG, "Suspend receivers source synchronization: " + broadcastId);

        stopLocalSourceReceivers(broadcastId, true);

    }



    /** Request receivers to stop broadcast sources synchronization and remove them */

    public void stopReceiversSourceSynchronization(int broadcastId) {

        sEventLogger.logd(DBG, TAG, "Stop receivers source synchronization: " + broadcastId);

        stopLocalSourceReceivers(broadcastId, false);

    }



    /** Request receivers to resume broadcast source synchronization */

    public void resumeReceiversSourceSynchronization(int broadcastId) {

        sEventLogger.logd(DBG, TAG, "Resume receivers source synchronization: " + broadcastId);



        while (!mPausedBroadcastSinks.isEmpty()) {

            BluetoothDevice sink = mPausedBroadcastSinks.remove();

            BluetoothLeBroadcastMetadata metadata = mBroadcastMetadataMap.get(sink);



            addSource(sink, metadata, true);

        }

    }



    /**

     * Callback handler

     */