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

Commit 4fba3624 authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Gerrit Code Review
Browse files

Merge changes I0917ce3f,Ia9c879a8,I3cd2a839,I703b5e1e 

* changes:
  le_audio: Deactivate active group before removing last active member
  le_audio: Introduce LeAudioDevice descriptor
  Remove dead intent related code for LeAudio
  Remove no longer needed import of RequiredPermission annotation module
parents 6cdfb6bf c7911d8f

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

+347 −162

File changed.

Preview size limit exceeded, changes collapsed.

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

+0 −2
Original line number Diff line number Diff line
@@ -55,8 +55,6 @@ import android.os.Message; 
import android.util.Log;

import static android.Manifest.permission.BLUETOOTH_CONNECT;



import android.annotation.RequiresPermission;



import com.android.bluetooth.Utils;

import com.android.bluetooth.btservice.ProfileService;

import com.android.internal.annotations.VisibleForTesting;

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

+16 −0
Original line number Diff line number Diff line
@@ -633,6 +633,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);
@@ -700,6 +703,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);
@@ -767,6 +773,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);
@@ -1501,6 +1510,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);
@@ -1606,6 +1618,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);