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

Commit 45f6e294 authored by Jakub Tyszkowski's avatar Jakub Tyszkowski
Browse files

BassClient: Fix not sending connection change intent 

Bug: 150670922
Tag: #feature
Sponsor: jpawlowski@
Test: atest BluetoothInstrumentationTests
Change-Id: I74cf261e059a246907064722feebf7477433af16
parent 2c6d8a46

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

+15 −2
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ 
 */

package com.android.bluetooth.bass_client;



import static android.Manifest.permission.BLUETOOTH_CONNECT;



import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothGatt;
@@ -65,6 +67,7 @@ import android.bluetooth.BluetoothGattDescriptor; 
import android.bluetooth.BluetoothGattService;

import android.bluetooth.BluetoothLeAudioCodecConfigMetadata;

import android.bluetooth.BluetoothLeAudioContentMetadata;

import android.bluetooth.BluetoothLeBroadcastAssistant;

import android.bluetooth.BluetoothLeBroadcastChannel;

import android.bluetooth.BluetoothLeBroadcastMetadata;

import android.bluetooth.BluetoothLeBroadcastReceiveState;
@@ -76,6 +79,7 @@ import android.bluetooth.le.PeriodicAdvertisingManager; 
import android.bluetooth.le.PeriodicAdvertisingReport;

import android.bluetooth.le.ScanRecord;

import android.bluetooth.le.ScanResult;

import android.content.Intent;

import android.os.Binder;

import android.os.Looper;

import android.os.Message;
@@ -83,6 +87,7 @@ import android.os.ParcelUuid; 
import android.provider.DeviceConfig;

import android.util.Log;



import com.android.bluetooth.Utils;

import com.android.bluetooth.btservice.ProfileService;

import com.android.bluetooth.btservice.ServiceFactory;

import com.android.internal.annotations.VisibleForTesting;
@@ -1346,7 +1351,7 @@ public class BassClientStateMachine extends StateMachine { 
                    + messageWhatToString(getCurrentMessage().what));

            removeDeferredMessages(CONNECT);

            if (mLastConnectionState == BluetoothProfile.STATE_CONNECTED) {

                log("CONNECTED->CONNTECTED: Ignore");

                log("CONNECTED->CONNECTED: Ignore");

            } else {

                broadcastConnectionState(mDevice, mLastConnectionState,

                        BluetoothProfile.STATE_CONNECTED);
@@ -1743,9 +1748,17 @@ public class BassClientStateMachine extends StateMachine { 
        log("broadcastConnectionState " + device + ": " + fromState + "->" + toState);

        if (fromState == BluetoothProfile.STATE_CONNECTED

                && toState == BluetoothProfile.STATE_CONNECTED) {

            log("CONNECTED->CONNTECTED: Ignore");

            log("CONNECTED->CONNECTED: Ignore");

            return;

        }



        Intent intent = new Intent(BluetoothLeBroadcastAssistant.ACTION_CONNECTION_STATE_CHANGED);

        intent.putExtra(BluetoothProfile.EXTRA_PREVIOUS_STATE, fromState);

        intent.putExtra(BluetoothProfile.EXTRA_STATE, toState);

        intent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);

        intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT

                    | Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

        mService.sendBroadcast(intent, BLUETOOTH_CONNECT, Utils.getTempAllowlistBroadcastOptions());

    }



    int getConnectionState() {