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

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

Merge "Remove dependency on BT broadcasts inside the Bluetooth Thread." into main am: 4d02dd82 

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



Change-Id: If0c882e08fe0082a09adeb322dd1627cac3c9c5a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a8915975 4d02dd82

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

+8 −9
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import static com.android.bluetooth.Utils.enforceBluetoothPrivilegedPermission; 


import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothLeBroadcastAssistant;

import android.bluetooth.BluetoothLeBroadcastMetadata;

import android.bluetooth.BluetoothLeBroadcastReceiveState;

import android.bluetooth.BluetoothProfile;
@@ -95,6 +94,7 @@ public class BassClientService extends ProfileService { 


    private HandlerThread mStateMachinesThread;

    private HandlerThread mCallbackHandlerThread;

    private Handler mHandler = null;

    private AdapterService mAdapterService;

    private DatabaseManager mDatabaseManager;

    private BluetoothAdapter mBluetoothAdapter = null;
@@ -309,10 +309,12 @@ public class BassClientService extends ProfileService { 
        mCallbackHandlerThread.start();

        mCallbacks = new Callbacks(mCallbackHandlerThread.getLooper());



        // Setup Handler to handle local broadcast use cases.

        mHandler = new Handler(Looper.getMainLooper());



        IntentFilter filter = new IntentFilter();

        filter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);

        filter.addAction(BluetoothDevice.ACTION_BOND_STATE_CHANGED);

        filter.addAction(BluetoothLeBroadcastAssistant.ACTION_CONNECTION_STATE_CHANGED);

        mIntentReceiver = new BroadcastReceiver() {

            @Override

            public void onReceive(Context context, Intent intent) {
@@ -327,13 +329,6 @@ public class BassClientService extends ProfileService { 
                            "ACTION_BOND_STATE_CHANGED with no EXTRA_DEVICE");

                    bondStateChanged(device, state);



                } else if (action.equals(

                            BluetoothLeBroadcastAssistant.ACTION_CONNECTION_STATE_CHANGED)) {

                    BluetoothDevice device =

                            intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);

                    int toState = intent.getIntExtra(BluetoothProfile.EXTRA_STATE, -1);

                    int fromState = intent.getIntExtra(BluetoothProfile.EXTRA_PREVIOUS_STATE, -1);

                    connectionStateChanged(device, fromState, toState);

                }

            }

        };
@@ -676,6 +671,10 @@ public class BassClientService extends ProfileService { 
        mPeriodicAdvertisementResultMap.remove(device);

    }



    void handleConnectionStateChanged(BluetoothDevice device, int fromState, int toState) {

        mHandler.post(() -> connectionStateChanged(device, fromState, toState));

    }



    synchronized void connectionStateChanged(BluetoothDevice device, int fromState,

                                             int toState) {

        if ((device == null) || (fromState == toState)) {

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

+1 −0
Original line number Diff line number Diff line
@@ -1883,6 +1883,7 @@ public class BassClientStateMachine extends StateMachine { 
            return;

        }



        mService.handleConnectionStateChanged(device, fromState, toState);

        Intent intent = new Intent(BluetoothLeBroadcastAssistant.ACTION_CONNECTION_STATE_CHANGED);

        intent.putExtra(BluetoothProfile.EXTRA_PREVIOUS_STATE, fromState);

        intent.putExtra(BluetoothProfile.EXTRA_STATE, toState);