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

Commit a027a113 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes Ied008f0c,Ia52234b4 into tm-qpr-dev am: 1994ee52 

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



Change-Id: If854ebda7ad81daecd2edd4f86e331abdc6b8f30
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b1abd195 1994ee52

android/app/tests/unit/src/com/android/bluetooth/le_audio/LeAudioServiceTest.java

+10 −10
Original line number Diff line number Diff line
@@ -1034,7 +1034,7 @@ public class LeAudioServiceTest { 
    @Test

    public void testGetActiveDevices() {

        int groupId = 1;

        int direction = 1;

        int direction = 2;

        int snkAudioLocation = 3;

        int srcAudioLocation = 4;

        int availableContexts = 5;
@@ -1085,8 +1085,7 @@ public class LeAudioServiceTest { 
        mService.messageFromNative(groupStatusChangedEvent);

    }



    private void injectAudioConfChanged(int groupId, Integer availableContexts) {

        int direction = 1;

    private void injectAudioConfChanged(int groupId, Integer availableContexts, int direction) {

        int snkAudioLocation = 3;

        int srcAudioLocation = 4;

        int eventType = LeAudioStackEvent.EVENT_TYPE_AUDIO_CONF_CHANGED;
@@ -1109,7 +1108,7 @@ public class LeAudioServiceTest { 
        doReturn(true).when(mNativeInterface).connectLeAudio(any(BluetoothDevice.class));

        connectTestDevice(mSingleDevice, testGroupId);

        injectAudioConfChanged(testGroupId, BluetoothLeAudio.CONTEXT_TYPE_MEDIA |

                         BluetoothLeAudio.CONTEXT_TYPE_CONVERSATIONAL);

                         BluetoothLeAudio.CONTEXT_TYPE_CONVERSATIONAL, 3);

        injectGroupStatusChange(testGroupId, BluetoothLeAudio.GROUP_STATUS_ACTIVE);



        String action = BluetoothLeAudio.ACTION_LE_AUDIO_ACTIVE_DEVICE_CHANGED;
@@ -1131,7 +1130,7 @@ public class LeAudioServiceTest { 
        String action = BluetoothLeAudio.ACTION_LE_AUDIO_ACTIVE_DEVICE_CHANGED;

        Integer contexts = BluetoothLeAudio.CONTEXT_TYPE_MEDIA |

        BluetoothLeAudio.CONTEXT_TYPE_CONVERSATIONAL;

        injectAudioConfChanged(testGroupId, contexts);

        injectAudioConfChanged(testGroupId, contexts, 3);



        Intent intent = TestUtils.waitForNoIntent(TIMEOUT_MS, mDeviceQueueMap.get(mSingleDevice));

        assertThat(intent).isNull();
@@ -1146,7 +1145,7 @@ public class LeAudioServiceTest { 


        String action = BluetoothLeAudio.ACTION_LE_AUDIO_ACTIVE_DEVICE_CHANGED;



        injectAudioConfChanged(testGroupId, 0);

        injectAudioConfChanged(testGroupId, 0, 3);

        Intent intent = TestUtils.waitForNoIntent(TIMEOUT_MS, mDeviceQueueMap.get(mSingleDevice));

        assertThat(intent).isNull();

    }
@@ -1192,7 +1191,7 @@ public class LeAudioServiceTest { 
        connectTestDevice(mSingleDevice, testGroupId);



        injectAudioConfChanged(testGroupId, BluetoothLeAudio.CONTEXT_TYPE_MEDIA |

                                 BluetoothLeAudio.CONTEXT_TYPE_CONVERSATIONAL);

                                 BluetoothLeAudio.CONTEXT_TYPE_CONVERSATIONAL, 3);



        sendEventAndVerifyIntentForGroupStatusChanged(testGroupId, LeAudioStackEvent.GROUP_STATUS_ACTIVE);

        sendEventAndVerifyIntentForGroupStatusChanged(testGroupId, LeAudioStackEvent.GROUP_STATUS_INACTIVE);
@@ -1285,7 +1284,7 @@ public class LeAudioServiceTest { 
    @Test

    public void testLeadGroupDeviceDisconnects() {

        int groupId = 1;

        int direction = 1;

        int direction = 2;

        int snkAudioLocation = 3;

        int srcAudioLocation = 4;

        int availableContexts = 5;
@@ -1350,7 +1349,7 @@ public class LeAudioServiceTest { 
    @Test

    public void testLeadGroupDeviceReconnects() {

        int groupId = 1;

        int direction = 1;

        int direction = 2;

        int snkAudioLocation = 3;

        int srcAudioLocation = 4;

        int availableContexts = 5;
@@ -1417,6 +1416,7 @@ public class LeAudioServiceTest { 
    public void testVolumeCache() {

        int groupId = 1;

        int volume = 100;

        int direction = 2;

        int availableContexts = 4;



        doReturn(true).when(mNativeInterface).connectLeAudio(any(BluetoothDevice.class));
@@ -1429,7 +1429,7 @@ public class LeAudioServiceTest { 
                        ArgumentCaptor.forClass(BluetoothProfileConnectionInfo.class);



        //Add location support.

        injectAudioConfChanged(groupId, availableContexts);

        injectAudioConfChanged(groupId, availableContexts, direction);



        doReturn(-1).when(mVolumeControlService).getAudioDeviceGroupVolume(groupId);

        //Set group and device as active.