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

Commit 3ab118fd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Set communication audio flag for BT le device and hearing aid device... 

Merge "Set communication audio flag for BT le device and hearing aid device off if the communication device is already set to other devices." into tm-qpr-dev
parents e15d1661 c5307d2d

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -435,6 +435,7 @@ public class BluetoothDeviceManager { 
            mAudioManager.clearCommunicationDevice();

            mAudioManager.clearCommunicationDevice();

            mLeAudioSetAsCommunicationDevice = false;

            mLeAudioSetAsCommunicationDevice = false;

        }

        }

        mLeAudioSetAsCommunicationDevice = false;

    }

    }





    public void clearHearingAidCommunicationDevice() {

    public void clearHearingAidCommunicationDevice() {
@@ -453,6 +454,7 @@ public class BluetoothDeviceManager { 
            mAudioManager.clearCommunicationDevice();

            mAudioManager.clearCommunicationDevice();

            mHearingAidSetAsCommunicationDevice = false;

            mHearingAidSetAsCommunicationDevice = false;

        }

        }

        mHearingAidSetAsCommunicationDevice = false;

    }

    }





    public boolean setLeAudioCommunicationDevice() {

    public boolean setLeAudioCommunicationDevice() {

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

+15 −2
Original line number Original line Diff line number Diff line
@@ -22,7 +22,6 @@ import android.bluetooth.BluetoothHeadset; 
import android.bluetooth.BluetoothHearingAid;

import android.bluetooth.BluetoothHearingAid;

import android.bluetooth.BluetoothLeAudio;

import android.bluetooth.BluetoothLeAudio;

import android.bluetooth.BluetoothProfile;

import android.bluetooth.BluetoothProfile;

import android.content.BroadcastReceiver;

import android.content.Intent;

import android.content.Intent;

import android.media.AudioDeviceInfo;

import android.media.AudioDeviceInfo;

import android.media.AudioManager;

import android.media.AudioManager;
@@ -42,6 +41,7 @@ import org.mockito.ArgumentCaptor; 
import org.mockito.Mock;

import org.mockito.Mock;





import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertNull;

import static org.junit.Assert.assertNull;

import static org.mockito.ArgumentMatchers.isNull;

import static org.mockito.ArgumentMatchers.isNull;

import static org.mockito.ArgumentMatchers.nullable;

import static org.mockito.ArgumentMatchers.nullable;
@@ -49,7 +49,6 @@ import static org.mockito.Matchers.any; 
import static org.mockito.Matchers.eq;

import static org.mockito.Matchers.eq;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;

import static org.mockito.Mockito.when;
@@ -482,6 +481,20 @@ public class BluetoothDeviceManagerTest extends TelecomTestCase { 
        verify(mAdapter).setActiveDevice(device6, BluetoothAdapter.ACTIVE_DEVICE_ALL);

        verify(mAdapter).setActiveDevice(device6, BluetoothAdapter.ACTIVE_DEVICE_ALL);

    }

    }





    @SmallTest

    @Test

    public void testClearHearingAidCommunicationDevice() {

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



        when(mockAudioManager.getAvailableCommunicationDevices())

                .thenReturn(devices);



        mBluetoothDeviceManager.setHearingAidCommunicationDevice();

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

        mBluetoothDeviceManager.clearHearingAidCommunicationDevice();

        assertFalse(mBluetoothDeviceManager.isHearingAidSetAsCommunicationDevice());

    }



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

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

        String intentString;

        String intentString;