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

Commit cac64278 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Resolve BluetoothRouteManagerTest failures" into main

parents 9006a320 7b6f845f

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

+5 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import android.bluetooth.BluetoothLeAudio; 
import android.bluetooth.BluetoothProfile;

import android.bluetooth.BluetoothStatusCodes;

import android.content.ContentResolver;

import android.media.AudioDeviceInfo;

import android.os.Parcel;

import android.telecom.Log;
@@ -104,6 +105,8 @@ public class BluetoothRouteManagerTest extends TelecomTestCase { 
            BluetoothDeviceManager.DEVICE_TYPE_HEARING_AID);

        when(mDeviceManager.connectAudio(anyString(), anyBoolean())).thenReturn(true);

        when(mDeviceManager.isHearingAidSetAsCommunicationDevice()).thenReturn(true);

        when(mCommunicationDeviceTracker.isAudioDeviceSetForType(

                eq(AudioDeviceInfo.TYPE_HEARING_AID))).thenReturn(true);



        setupConnectedDevices(null, HEARING_AIDS, null, null, HEARING_AIDS, null);

        when(mBluetoothHeadset.getAudioState(nullable(BluetoothDevice.class)))
@@ -130,7 +133,8 @@ public class BluetoothRouteManagerTest extends TelecomTestCase { 
            BluetoothDeviceManager.DEVICE_TYPE_HEARING_AID);

        when(mDeviceManager.connectAudio(anyString(), anyBoolean())).thenReturn(true);

        when(mDeviceManager.isHearingAidSetAsCommunicationDevice()).thenReturn(true);



        when(mCommunicationDeviceTracker.isAudioDeviceSetForType(

                eq(AudioDeviceInfo.TYPE_HEARING_AID))).thenReturn(true);



        setupConnectedDevices(null, HEARING_AIDS, null, null, HEARING_AIDS, null);

        when(mBluetoothHeadset.getAudioState(nullable(BluetoothDevice.class)))