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

Commit 636396e4 authored by Grzegorz Kołodziejczyk's avatar Grzegorz Kołodziejczyk
Browse files

le_audio: Introduce LeAudioDevice descriptor 

Intention of this CL is packing all device related members into
descriptor as it's done for group to better maintenance.

Tag: #feature
Bug: 261362580
Test: atest LeAudioServiceTest
Change-Id: Ia9c879a84f5efd0492995d1d5c1455a254e15c85
Merged-In: Ia9c879a84f5efd0492995d1d5c1455a254e15c85
(cherry picked from commit ab214a39)
parent 4939a1a9

android/app/src/com/android/bluetooth/le_audio/LeAudioService.java

+340 −157

File changed.

Preview size limit exceeded, changes collapsed.

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

+16 −0
Original line number Diff line number Diff line
@@ -643,6 +643,9 @@ public class LeAudioServiceTest { 
        doReturn(true).when(mNativeInterface).connectLeAudio(any(BluetoothDevice.class));

        doReturn(true).when(mNativeInterface).disconnectLeAudio(any(BluetoothDevice.class));



        // Create device descriptor with connect request

        assertWithMessage("Connect failed").that(mService.connect(mLeftDevice)).isTrue();



        // Le Audio stack event: CONNECTION_STATE_CONNECTING - state machine should be created

        generateConnectionMessageFromNative(mLeftDevice, BluetoothProfile.STATE_CONNECTING,

                BluetoothProfile.STATE_DISCONNECTED);
@@ -710,6 +713,9 @@ public class LeAudioServiceTest { 
        doReturn(true).when(mNativeInterface).connectLeAudio(any(BluetoothDevice.class));

        doReturn(true).when(mNativeInterface).disconnectLeAudio(any(BluetoothDevice.class));



        // Create device descriptor with connect request

        assertWithMessage("Connect failed").that(mService.connect(mLeftDevice)).isTrue();



        // LeAudio stack event: CONNECTION_STATE_CONNECTING - state machine should be created

        generateConnectionMessageFromNative(mLeftDevice, BluetoothProfile.STATE_CONNECTING,

                BluetoothProfile.STATE_DISCONNECTED);
@@ -777,6 +783,9 @@ public class LeAudioServiceTest { 
        doReturn(true).when(mNativeInterface).connectLeAudio(any(BluetoothDevice.class));

        doReturn(true).when(mNativeInterface).disconnectLeAudio(any(BluetoothDevice.class));



        // Create device descriptor with connect request

        assertWithMessage("Connect failed").that(mService.connect(mLeftDevice)).isTrue();



        // LeAudio stack event: CONNECTION_STATE_CONNECTING - state machine should be created

        generateConnectionMessageFromNative(mLeftDevice, BluetoothProfile.STATE_CONNECTING,

                BluetoothProfile.STATE_DISCONNECTED);
@@ -1514,6 +1523,9 @@ public class LeAudioServiceTest { 


    @Test

    public void testGetAudioLocation() {

        doReturn(true).when(mNativeInterface).connectLeAudio(any(BluetoothDevice.class));

        connectTestDevice(mSingleDevice, testGroupId);



        assertThat(mService.getAudioLocation(null))

                .isEqualTo(BluetoothLeAudio.AUDIO_LOCATION_INVALID);
@@ -1619,6 +1631,10 @@ public class LeAudioServiceTest { 
    public void testAuthorizeMcpServiceOnBluetoothEnableAndNodeRemoval() {

        int groupId = 1;



        doReturn(true).when(mNativeInterface).connectLeAudio(any(BluetoothDevice.class));

        connectTestDevice(mLeftDevice, groupId);

        connectTestDevice(mRightDevice, groupId);



        generateGroupNodeAdded(mLeftDevice, groupId);

        generateGroupNodeAdded(mRightDevice, groupId);