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

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

Merge "BassClient: Respect forbidden connection policy" am: b9e4b63e 

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



Change-Id: I9762d9acc9e51f6baa85bc9e50c3643316eef4a8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2ea96d86 b9e4b63e

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

+3 −3
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.bluetooth.bass_client;



import static android.Manifest.permission.BLUETOOTH_CONNECT;



import static com.android.bluetooth.Utils.enforceBluetoothPrivilegedPermission;



import android.bluetooth.BluetoothAdapter;
@@ -49,7 +50,6 @@ import com.android.bluetooth.btservice.AdapterService; 
import com.android.bluetooth.btservice.ProfileService;

import com.android.internal.annotations.VisibleForTesting;



import java.nio.ByteBuffer;

import java.util.ArrayList;

import java.util.Collections;

import java.util.HashMap;
@@ -394,8 +394,8 @@ public class BassClientService extends ProfileService { 
            Log.e(TAG, "connect: device is null");

            return false;

        }

        if (getConnectionPolicy(device) == BluetoothProfile.CONNECTION_POLICY_UNKNOWN) {

            Log.e(TAG, "connect: unknown connection policy");

        if (getConnectionPolicy(device) == BluetoothProfile.CONNECTION_POLICY_FORBIDDEN) {

            Log.e(TAG, "connect: connection policy set to forbidden");

            return false;

        }

        synchronized (mStateMachines) {

android/app/tests/unit/src/com/android/bluetooth/bass_client/BassClientServiceTest.java

+3 −3
Original line number Diff line number Diff line
@@ -181,14 +181,14 @@ public class BassClientServiceTest { 
    }



    /**

     * Test connecting to a device when the connection policy is unknown.

     * Test connecting to a device when the connection policy is forbidden.

     *  - service.connect() should return false.

     */

    @Test

    public void testConnect_whenConnectionPolicyIsUnknown() {

    public void testConnect_whenConnectionPolicyIsForbidden() {

        when(mDatabaseManager.getProfileConnectionPolicy(any(BluetoothDevice.class),

                eq(BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT)))

                .thenReturn(BluetoothProfile.CONNECTION_POLICY_UNKNOWN);

                .thenReturn(BluetoothProfile.CONNECTION_POLICY_FORBIDDEN);

        mCurrentDevice = TestUtils.getTestDevice(mBluetoothAdapter, 0);

        assertThat(mCurrentDevice).isNotNull();