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

Commit 87745088 authored Feb 02, 2022 by Etienne Ruffieux Committed by Automerger Merge Worker Feb 02, 2022

Replacing getActiveDevice by btAdapter.getActiveDevices() am: 81c03370

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/1967401

Change-Id: I81e03911865623af15ef231b3a56010a7ee163ca

parents 10ada39b 81c03370

src/com/android/server/telecom/bluetooth/BluetoothRouteManager.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -794,7 +794,8 @@ public class BluetoothRouteManager extends StateMachine {

	if (bluetoothLeAudio != null) {		if (bluetoothLeAudio != null) {
	if (mDeviceManager.isLeAudioCommunicationDevice()) {		if (mDeviceManager.isLeAudioCommunicationDevice()) {
	for (BluetoothDevice device : bluetoothLeAudio.getActiveDevices()) {		for (BluetoothDevice device : bluetoothAdapter.getActiveDevices(
			BluetoothProfile.LE_AUDIO)) {
	if (device != null) {		if (device != null) {
	leAudioActiveDevice = device;		leAudioActiveDevice = device;
	activeDevices++;		activeDevices++;

tests/src/com/android/server/telecom/tests/BluetoothDeviceManagerTest.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -423,7 +423,8 @@ public class BluetoothDeviceManagerTest extends TelecomTestCase {
	verify(mAdapter, never()).setActiveDevice(nullable(BluetoothDevice.class),		verify(mAdapter, never()).setActiveDevice(nullable(BluetoothDevice.class),
	eq(BluetoothAdapter.ACTIVE_DEVICE_PHONE_CALL));		eq(BluetoothAdapter.ACTIVE_DEVICE_PHONE_CALL));

	when(mBluetoothLeAudio.getActiveDevices()).thenReturn(Arrays.asList(device5, device6));		when(mAdapter.getActiveDevices(eq(BluetoothProfile.LE_AUDIO)))
			.thenReturn(Arrays.asList(device5, device6));

	receiverUnderTest.onReceive(mContext,		receiverUnderTest.onReceive(mContext,
	buildConnectionActionIntent(BluetoothHeadset.STATE_DISCONNECTED, device5,		buildConnectionActionIntent(BluetoothHeadset.STATE_DISCONNECTED, device5,

tests/src/com/android/server/telecom/tests/BluetoothRouteManagerTest.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -206,7 +206,7 @@ public class BluetoothRouteManagerTest extends TelecomTestCase {
	.thenReturn(Arrays.asList(hearingAidDevices));		.thenReturn(Arrays.asList(hearingAidDevices));
	when(mBluetoothAdapter.getActiveDevices(eq(BluetoothProfile.HEARING_AID)))		when(mBluetoothAdapter.getActiveDevices(eq(BluetoothProfile.HEARING_AID)))
	.thenReturn(Arrays.asList(hearingAidActiveDevice, null));		.thenReturn(Arrays.asList(hearingAidActiveDevice, null));
	when(mBluetoothLeAudio.getActiveDevices())		when(mBluetoothAdapter.getActiveDevices(eq(BluetoothProfile.LE_AUDIO)))
	.thenReturn(Arrays.asList(leAudioDevice, null));		.thenReturn(Arrays.asList(leAudioDevice, null));
	}		}

tests/src/com/android/server/telecom/tests/BluetoothRouteTransitionTests.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -314,7 +314,7 @@ public class BluetoothRouteTransitionTests extends TelecomTestCase {
	if (mParams.hearingAidBtDevices.contains(mParams.messageDevice)) {		if (mParams.hearingAidBtDevices.contains(mParams.messageDevice)) {
	when(mBluetoothAdapter.getActiveDevices(eq(BluetoothProfile.HEARING_AID)))		when(mBluetoothAdapter.getActiveDevices(eq(BluetoothProfile.HEARING_AID)))
	.thenReturn(Arrays.asList(null, null));		.thenReturn(Arrays.asList(null, null));
	when(mBluetoothLeAudio.getActiveDevices())		when(mBluetoothAdapter.getActiveDevices(eq(BluetoothProfile.LE_AUDIO)))
	.thenReturn(mParams.leAudioDevices.stream()		.thenReturn(mParams.leAudioDevices.stream()
	.filter(device -> device != mParams.messageDevice)		.filter(device -> device != mParams.messageDevice)
	.collect(Collectors.toList()));		.collect(Collectors.toList()));