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

Commit de6e935d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make BT audio routing more resemble the Android S behavior" am: 18943264 

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



Change-Id: Id32500eae73bab78be0fe996b1c2f646f8a0b495
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 31a0b3d0 18943264

android/app/src/com/android/bluetooth/btservice/ActiveDeviceManager.java

+316 −86

File changed.

Preview size limit exceeded, changes collapsed.

android/app/src/com/android/bluetooth/mcp/MediaControlGattService.java

+0 −10
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ import static android.bluetooth.BluetoothGattCharacteristic.PROPERTY_READ; 
import static android.bluetooth.BluetoothGattCharacteristic.PROPERTY_WRITE;

import static android.bluetooth.BluetoothGattCharacteristic.PROPERTY_WRITE_NO_RESPONSE;



import static java.util.Map.entry;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.bluetooth.BluetoothDevice;
@@ -43,9 +41,7 @@ import android.os.Looper; 
import android.util.Log;

import android.util.Pair;



import com.android.bluetooth.a2dp.A2dpService;

import com.android.bluetooth.btservice.AdapterService;

import com.android.bluetooth.hearingaid.HearingAidService;

import com.android.bluetooth.le_audio.LeAudioService;

import com.android.internal.annotations.VisibleForTesting;
@@ -893,12 +889,6 @@ public class MediaControlGattService implements MediaControlGattServiceInterface 
        }



        if (req.getOpcode() == Request.Opcodes.PLAY) {

            if (mAdapterService.getActiveDevices(BluetoothProfile.A2DP).size() > 0) {

                A2dpService.getA2dpService().setActiveDevice(null);

            }

            if (mAdapterService.getActiveDevices(BluetoothProfile.HEARING_AID).size() > 0) {

                HearingAidService.getHearingAidService().setActiveDevice(null);

            }

            if (mLeAudioService == null) {

                mLeAudioService = LeAudioService.getLeAudioService();

            }

android/app/tests/unit/src/com/android/bluetooth/btservice/ActiveDeviceManagerTest.java

+58 −12
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ package com.android.bluetooth.btservice; 


import static org.mockito.Mockito.any;

import static org.mockito.Mockito.anyBoolean;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.isNull;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.timeout;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;
@@ -60,7 +60,6 @@ import org.mockito.MockitoAnnotations; 


import java.util.ArrayList;

import java.util.List;

import java.util.Objects;



@MediumTest

@RunWith(AndroidJUnit4.class)
@@ -87,6 +86,7 @@ public class ActiveDeviceManagerTest { 
    @Mock private LeAudioService mLeAudioService;

    @Mock private AudioManager mAudioManager;

    @Mock private DatabaseManager mDatabaseManager;

    private AudioManager.OnModeChangedListener mAudioModeChangedListener;



    @Before

    public void setUp() throws Exception {
@@ -99,6 +99,10 @@ public class ActiveDeviceManagerTest { 
        MockitoAnnotations.initMocks(this);

        TestUtils.setAdapterService(mAdapterService);



        doAnswer(invocation -> {

            mAudioModeChangedListener = invocation.getArgument(1);

            return null;

        }).when(mAudioManager).addOnModeChangedListener(any(), any());

        when(mAdapterService.getSystemService(Context.AUDIO_SERVICE)).thenReturn(mAudioManager);

        when(mAdapterService.getSystemServiceName(AudioManager.class))

                .thenReturn(Context.AUDIO_SERVICE);
@@ -129,15 +133,13 @@ public class ActiveDeviceManagerTest { 
        when(mLeAudioService.setActiveDevice(any(), anyBoolean())).thenReturn(true);



        when(mA2dpService.getFallbackDevice()).thenAnswer(invocation -> {

            if (!mDeviceConnectionStack.isEmpty() && Objects.equals(mA2dpDevice,

                    mDeviceConnectionStack.get(mDeviceConnectionStack.size() - 1))) {

            if (mDeviceConnectionStack.contains(mA2dpDevice)) {

                return mA2dpDevice;

            }

            return null;

        });

        when(mHeadsetService.getFallbackDevice()).thenAnswer(invocation -> {

            if (!mDeviceConnectionStack.isEmpty() && Objects.equals(mHeadsetDevice,

                    mDeviceConnectionStack.get(mDeviceConnectionStack.size() - 1))) {

            if (mDeviceConnectionStack.contains(mHeadsetDevice)) {

                return mHeadsetDevice;

            }

            return null;
@@ -219,7 +221,7 @@ public class ActiveDeviceManagerTest { 
        a2dpActiveDeviceChanged(mA2dpDevice);

        // Don't call mA2dpService.setActiveDevice()

        TestUtils.waitForLooperToFinishScheduledTask(mActiveDeviceManager.getHandlerLooper());

        verify(mA2dpService, times(1)).setActiveDevice(mA2dpDevice, false);

        verify(mA2dpService).setActiveDevice(mA2dpDevice, false);

        Assert.assertEquals(mA2dpDevice, mActiveDeviceManager.getA2dpActiveDevice());

    }
@@ -295,7 +297,7 @@ public class ActiveDeviceManagerTest { 
        headsetActiveDeviceChanged(mHeadsetDevice);

        // Don't call mHeadsetService.setActiveDevice()

        TestUtils.waitForLooperToFinishScheduledTask(mActiveDeviceManager.getHandlerLooper());

        verify(mHeadsetService, times(1)).setActiveDevice(mHeadsetDevice);

        verify(mHeadsetService).setActiveDevice(mHeadsetDevice);

        Assert.assertEquals(mHeadsetDevice, mActiveDeviceManager.getHfpActiveDevice());

    }
@@ -366,7 +368,7 @@ public class ActiveDeviceManagerTest { 
        a2dpActiveDeviceChanged(mA2dpHeadsetDevice);



        TestUtils.waitForLooperToFinishScheduledTask(mActiveDeviceManager.getHandlerLooper());

        verify(mHearingAidService).setActiveDevice(null, false);

        verify(mHearingAidService).setActiveDevice(null, true);

        // Don't call mA2dpService.setActiveDevice()

        verify(mA2dpService, never()).setActiveDevice(mA2dpHeadsetDevice, false);

        Assert.assertEquals(mA2dpHeadsetDevice, mActiveDeviceManager.getA2dpActiveDevice());
@@ -386,7 +388,7 @@ public class ActiveDeviceManagerTest { 
        headsetActiveDeviceChanged(mA2dpHeadsetDevice);



        TestUtils.waitForLooperToFinishScheduledTask(mActiveDeviceManager.getHandlerLooper());

        verify(mHearingAidService).setActiveDevice(null, false);

        verify(mHearingAidService).setActiveDevice(null, true);

        // Don't call mHeadsetService.setActiveDevice()

        verify(mHeadsetService, never()).setActiveDevice(mA2dpHeadsetDevice);

        Assert.assertEquals(mA2dpHeadsetDevice, mActiveDeviceManager.getHfpActiveDevice());
@@ -440,7 +442,7 @@ public class ActiveDeviceManagerTest { 
        leAudioActiveDeviceChanged(mLeAudioDevice);

        // Don't call mLeAudioService.setActiveDevice()

        TestUtils.waitForLooperToFinishScheduledTask(mActiveDeviceManager.getHandlerLooper());

        verify(mLeAudioService, times(1)).setActiveDevice(mLeAudioDevice, false);

        verify(mLeAudioService).setActiveDevice(mLeAudioDevice, false);

        Assert.assertEquals(mLeAudioDevice, mActiveDeviceManager.getLeAudioActiveDevice());

    }
@@ -609,7 +611,7 @@ public class ActiveDeviceManagerTest { 
        a2dpActiveDeviceChanged(mA2dpDevice);

        TestUtils.waitForLooperToFinishScheduledTask(mActiveDeviceManager.getHandlerLooper());



        verify(mHearingAidService).setActiveDevice(null, false);

        verify(mHearingAidService).setActiveDevice(null, true);

        verify(mLeAudioService, never()).setActiveDevice(mLeAudioDevice);

        verify(mA2dpService, never()).setActiveDevice(mA2dpDevice, false);
@@ -693,6 +695,50 @@ public class ActiveDeviceManagerTest { 
        verify(mHearingAidService, timeout(TIMEOUT_MS)).setActiveDevice(null, false);

    }



    @Test

    public void leAudioActive_whileMediaPlayback_useLeAudioForMediaAndHeadsetForCall() {

        leAudioConnected(mLeAudioDevice);

        a2dpConnected(mA2dpDevice);

        headsetConnected(mHeadsetDevice);

        verify(mLeAudioService, timeout(TIMEOUT_MS)).setActiveDevice(mLeAudioDevice, false);

        verify(mA2dpService, timeout(TIMEOUT_MS)).setActiveDevice(mA2dpDevice, false);

        verify(mHeadsetService, timeout(TIMEOUT_MS)).setActiveDevice(mHeadsetDevice);



        Mockito.clearInvocations(mLeAudioService, mA2dpService, mHeadsetService);

        leAudioActiveDeviceChanged(mLeAudioDevice);

        TestUtils.waitForLooperToFinishScheduledTask(mActiveDeviceManager.getHandlerLooper());

        verify(mA2dpService).setActiveDevice(null, true);

        verify(mHeadsetService).setActiveDevice(null);



        Mockito.clearInvocations(mLeAudioService, mA2dpService, mHeadsetService);

        mAudioModeChangedListener.onModeChanged(AudioManager.MODE_IN_CALL);

        verify(mHeadsetService).setActiveDevice(mHeadsetDevice);

        verify(mLeAudioService).setActiveDevice(null, true);

    }



    @Test

    public void leAudioActive_whileInCall_useLeAudioForCallAndHeadsetForMedia() {

        when(mAudioManager.getMode()).thenReturn(AudioManager.MODE_IN_CALL);



        leAudioConnected(mLeAudioDevice);

        headsetConnected(mHeadsetDevice);

        a2dpConnected(mA2dpDevice);

        verify(mLeAudioService, timeout(TIMEOUT_MS)).setActiveDevice(mLeAudioDevice, false);

        verify(mA2dpService, timeout(TIMEOUT_MS)).setActiveDevice(mA2dpDevice, false);

        verify(mHeadsetService, timeout(TIMEOUT_MS)).setActiveDevice(mHeadsetDevice);



        Mockito.clearInvocations(mLeAudioService, mA2dpService, mHeadsetService);

        leAudioActiveDeviceChanged(mLeAudioDevice);

        TestUtils.waitForLooperToFinishScheduledTask(mActiveDeviceManager.getHandlerLooper());

        verify(mA2dpService).setActiveDevice(null, true);

        verify(mHeadsetService).setActiveDevice(null);



        Mockito.clearInvocations(mLeAudioService, mA2dpService, mHeadsetService);

        mAudioModeChangedListener.onModeChanged(AudioManager.MODE_NORMAL);

        verify(mA2dpService).setActiveDevice(mA2dpDevice, false);

        verify(mLeAudioService).setActiveDevice(null, true);

    }



    /**

     * Helper to indicate A2dp connected for a device.

     */