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

Commit c5c2f3ea authored by Łukasz Rymanowski's avatar Łukasz Rymanowski Committed by Automerger Merge Worker
Browse files

Merge "leaudio: Fix direction bits" am: add5372a 

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



Change-Id: If317d2f780cc72d2f786ca82b64fb75f52603725
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 13dbdd93 add5372a

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

+4 −4
Original line number Diff line number Diff line
@@ -100,14 +100,14 @@ public class LeAudioService extends ProfileService { 
    private static final int AUDIO_DIRECTION_NONE = 0x00;



    /**

     * Indicates group audio support for input direction

     * Indicates group audio support for output direction

     */

    private static final int AUDIO_DIRECTION_INPUT_BIT = 0x01;

    private static final int AUDIO_DIRECTION_OUTPUT_BIT = 0x01;



    /**

     * Indicates group audio support for output direction

     * Indicates group audio support for input direction

     */

    private static final int AUDIO_DIRECTION_OUTPUT_BIT = 0x02;

    private static final int AUDIO_DIRECTION_INPUT_BIT = 0x02;



    private AdapterService mAdapterService;

    private DatabaseManager mDatabaseManager;

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

+8 −4
Original line number Diff line number Diff line
@@ -1037,7 +1037,8 @@ public class LeAudioServiceTest { 
    @Test

    public void testGetActiveDevices() {

        int groupId = 1;

        int direction = 2;

        /* AUDIO_DIRECTION_OUTPUT_BIT = 0x01 */

        int direction = 1;

        int snkAudioLocation = 3;

        int srcAudioLocation = 4;

        int availableContexts = 5;
@@ -1289,7 +1290,8 @@ public class LeAudioServiceTest { 
    @Ignore("b/258573934")

    public void testLeadGroupDeviceDisconnects() {

        int groupId = 1;

        int direction = 2;

        /* AUDIO_DIRECTION_OUTPUT_BIT = 0x01 */

        int direction = 1;

        int snkAudioLocation = 3;

        int srcAudioLocation = 4;

        int availableContexts = 5;
@@ -1354,7 +1356,8 @@ public class LeAudioServiceTest { 
    @Ignore("b/258573934")

    public void testLeadGroupDeviceReconnects() {

        int groupId = 1;

        int direction = 2;

        /* AUDIO_DIRECTION_OUTPUT_BIT = 0x01 */

        int direction = 1;

        int snkAudioLocation = 3;

        int srcAudioLocation = 4;

        int availableContexts = 5;
@@ -1421,7 +1424,8 @@ public class LeAudioServiceTest { 
    public void testVolumeCache() {

        int groupId = 1;

        int volume = 100;

        int direction = 2;

        /* AUDIO_DIRECTION_OUTPUT_BIT = 0x01 */

        int direction = 1;

        int availableContexts = 4;



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