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

Commit 8dab620e authored by Grzegorz Kołodziejczyk's avatar Grzegorz Kołodziejczyk Committed by Automerger Merge Worker
Browse files

le_audio: Introduce LeAudioDevice descriptor am: 636396e4 

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



Change-Id: I1c8de4019201e97c0702746e6fd9b1413c87e8c0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a45132b0 636396e4

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 Original line Diff line number Diff line
@@ -643,6 +643,9 @@ public class LeAudioServiceTest { 
        doReturn(true).when(mNativeInterface).connectLeAudio(any(BluetoothDevice.class));

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

        doReturn(true).when(mNativeInterface).disconnectLeAudio(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

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

        generateConnectionMessageFromNative(mLeftDevice, BluetoothProfile.STATE_CONNECTING,

        generateConnectionMessageFromNative(mLeftDevice, BluetoothProfile.STATE_CONNECTING,

                BluetoothProfile.STATE_DISCONNECTED);

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

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

        doReturn(true).when(mNativeInterface).disconnectLeAudio(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

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

        generateConnectionMessageFromNative(mLeftDevice, BluetoothProfile.STATE_CONNECTING,

        generateConnectionMessageFromNative(mLeftDevice, BluetoothProfile.STATE_CONNECTING,

                BluetoothProfile.STATE_DISCONNECTED);

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

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

        doReturn(true).when(mNativeInterface).disconnectLeAudio(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

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

        generateConnectionMessageFromNative(mLeftDevice, BluetoothProfile.STATE_CONNECTING,

        generateConnectionMessageFromNative(mLeftDevice, BluetoothProfile.STATE_CONNECTING,

                BluetoothProfile.STATE_DISCONNECTED);

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




    @Test

    @Test

    public void testGetAudioLocation() {

    public void testGetAudioLocation() {

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

        connectTestDevice(mSingleDevice, testGroupId);



        assertThat(mService.getAudioLocation(null))

        assertThat(mService.getAudioLocation(null))

                .isEqualTo(BluetoothLeAudio.AUDIO_LOCATION_INVALID);

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

    public void testAuthorizeMcpServiceOnBluetoothEnableAndNodeRemoval() {

        int groupId = 1;

        int groupId = 1;





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

        connectTestDevice(mLeftDevice, groupId);

        connectTestDevice(mRightDevice, groupId);



        generateGroupNodeAdded(mLeftDevice, groupId);

        generateGroupNodeAdded(mLeftDevice, groupId);

        generateGroupNodeAdded(mRightDevice, groupId);

        generateGroupNodeAdded(mRightDevice, groupId);