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

Commit f2058869 authored by Rongxuan Liu's avatar Rongxuan Liu
Browse files

[le audio] Connect bass profile only if le audio profile is allowed 

Check if remote device le audio profile is allowed when setting
broadcast assistant profile connection policy.
Only allow to connect BASS if remote supports le audio profile and
allowed by the phone side.

Test: atest PhonePolicyTest
Test: manual test and check bass profile connection state
Bug: 300227308
Change-Id: If929fe4a0adbd191dcd3bb7aec616fde6641cda4
parent 3e5dd996

android/app/src/com/android/bluetooth/btservice/PhonePolicy.java

+17 −5
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import android.os.Looper; 
import android.os.Message;

import android.os.ParcelUuid;

import android.os.SystemProperties;

import android.provider.DeviceConfig;

import android.util.Log;



import com.android.bluetooth.R;
@@ -433,9 +432,11 @@ public class PhonePolicy implements AdapterService.BluetoothStateCallback { 
                && Utils.arrayContains(uuids, BluetoothUuid.BASS)

                && (bcService.getConnectionPolicy(device)

                        == BluetoothProfile.CONNECTION_POLICY_UNKNOWN)) {

            if (isLeAudioProfileAllowed) {

                debugLog("setting broadcast assistant profile priority for device " + device);

                if (mAutoConnectProfilesSupported) {

                bcService.setConnectionPolicy(device, BluetoothProfile.CONNECTION_POLICY_ALLOWED);

                    bcService.setConnectionPolicy(

                            device, BluetoothProfile.CONNECTION_POLICY_ALLOWED);

                } else {

                    mAdapterService

                            .getDatabase()
@@ -444,6 +445,17 @@ public class PhonePolicy implements AdapterService.BluetoothStateCallback { 
                                    BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT,

                                    BluetoothProfile.CONNECTION_POLICY_ALLOWED);

                }

            } else {

                debugLog(

                        "clear broadcast assistant profile priority if le audio profile is not"

                                + " allowed");

                mAdapterService

                        .getDatabase()

                        .setProfileConnectionPolicy(

                                device,

                                BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT,

                                BluetoothProfile.CONNECTION_POLICY_FORBIDDEN);

            }

        }



        if ((batteryService != null)