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

Commit 026eaa73 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I3dac549c,I7ff35d5e am: f34b57a0 am: a4af2157 

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



Change-Id: Ic9b2dc4592c8f9f175470588bb469c34d79507de
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 006ffd97 a4af2157

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

+2 −2
Original line number Diff line number Diff line
@@ -431,8 +431,8 @@ public class BluetoothDeviceManager { 
                == AudioDeviceInfo.TYPE_BLE_HEADSET) {

            mBluetoothRouteManager.onAudioLost(mAudioManager.getCommunicationDevice().getAddress());

            mAudioManager.clearCommunicationDevice();

            mLeAudioSetAsCommunicationDevice = false;

        }

        mLeAudioSetAsCommunicationDevice = false;

    }



    public void clearHearingAidCommunicationDevice() {
@@ -448,8 +448,8 @@ public class BluetoothDeviceManager { 
                && mAudioManager.getCommunicationDevice().getType()

                == AudioDeviceInfo.TYPE_HEARING_AID) {

            mAudioManager.clearCommunicationDevice();

            mHearingAidSetAsCommunicationDevice = false;

        }

        mHearingAidSetAsCommunicationDevice = false;

    }



    public boolean setLeAudioCommunicationDevice() {

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

+25 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.server.telecom.tests;



import static android.media.AudioDeviceInfo.TYPE_BUILTIN_SPEAKER;



import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothHeadset;
@@ -42,6 +44,7 @@ import org.mockito.ArgumentCaptor; 
import org.mockito.Mock;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertNull;

import static org.mockito.ArgumentMatchers.isNull;

import static org.mockito.ArgumentMatchers.nullable;
@@ -65,6 +68,7 @@ public class BluetoothDeviceManagerTest extends TelecomTestCase { 
    @Mock BluetoothHearingAid mBluetoothHearingAid;

    @Mock BluetoothLeAudio mBluetoothLeAudio;

    @Mock AudioManager mockAudioManager;

    @Mock AudioDeviceInfo mSpeakerInfo;



    BluetoothDeviceManager mBluetoothDeviceManager;

    BluetoothProfile.ServiceListener serviceListenerUnderTest;
@@ -116,6 +120,8 @@ public class BluetoothDeviceManagerTest extends TelecomTestCase { 
                         ArgumentCaptor.forClass(BluetoothLeAudio.Callback.class);

        mBluetoothDeviceManager.setLeAudioServiceForTesting(mBluetoothLeAudio);

        verify(mBluetoothLeAudio).registerCallback(any(), leAudioCallbacksTest.capture());



        when(mSpeakerInfo.getType()).thenReturn(TYPE_BUILTIN_SPEAKER);

    }



    @Override
@@ -482,6 +488,25 @@ public class BluetoothDeviceManagerTest extends TelecomTestCase { 
        verify(mAdapter).setActiveDevice(device6, BluetoothAdapter.ACTIVE_DEVICE_ALL);

    }



    @SmallTest

    @Test

    public void testClearHearingAidCommunicationDevice() {

        AudioDeviceInfo mockAudioDeviceInfo = mock(AudioDeviceInfo.class);

        when(mockAudioDeviceInfo.getType()).thenReturn(AudioDeviceInfo.TYPE_HEARING_AID);

        List<AudioDeviceInfo> devices = new ArrayList<>();

        devices.add(mockAudioDeviceInfo);



        when(mockAudioManager.getAvailableCommunicationDevices())

                .thenReturn(devices);

        when(mockAudioManager.setCommunicationDevice(eq(mockAudioDeviceInfo)))

                .thenReturn(true);



        mBluetoothDeviceManager.setHearingAidCommunicationDevice();

        when(mockAudioManager.getCommunicationDevice()).thenReturn(mSpeakerInfo);

        mBluetoothDeviceManager.clearHearingAidCommunicationDevice();

        assertFalse(mBluetoothDeviceManager.isHearingAidSetAsCommunicationDevice());

    }



    private Intent buildConnectionActionIntent(int state, BluetoothDevice device, int deviceType) {

        String intentString;