Make the last active device overrides

The only exception is hearing aid device,
which isn't overriden by another profile
of another device.

Bug: 237496193
Test: atest ActiveDeviceManagerTest
Tag: #feature
Change-Id: Ia9c3b255a3613d0e10fb362dca5b113adbd92a19

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

@@ -217,9 +217,10 @@ class ActiveDeviceManager {
                             break;      // The device is already connected
                         }
                         mA2dpConnectedDevices.add(device);
-                        if (mHearingAidActiveDevice == null && mLeAudioActiveDevice == null) {
+                        if (mHearingAidActiveDevice == null) {
                             // New connected device: select it as active
                             setA2dpActiveDevice(device);
+                            setLeAudioActiveDevice(null);
                             break;
                         }
                         break;
@@ -277,9 +278,10 @@ class ActiveDeviceManager {
                             break;      // The device is already connected
                         }
                         mHfpConnectedDevices.add(device);
-                        if (mHearingAidActiveDevice == null && mLeAudioActiveDevice == null) {
+                        if (mHearingAidActiveDevice == null) {
                             // New connected device: select it as active
                             setHfpActiveDevice(device);
+                            setLeAudioActiveDevice(null);
                             break;
                         }
                         break;

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

@@ -324,8 +324,8 @@ public class ActiveDeviceManagerTest {
         headsetConnected(mA2dpHeadsetDevice);
 
         TestUtils.waitForLooperToFinishScheduledTask(mActiveDeviceManager.getHandlerLooper());
-        verify(mA2dpService, never()).setActiveDevice(mA2dpHeadsetDevice);
-        verify(mHeadsetService, never()).setActiveDevice(mA2dpHeadsetDevice);
+        verify(mA2dpService).setActiveDevice(mA2dpHeadsetDevice);
+        verify(mHeadsetService).setActiveDevice(mA2dpHeadsetDevice);
     }
 
     /**
@@ -342,8 +342,7 @@ public class ActiveDeviceManagerTest {
 
         TestUtils.waitForLooperToFinishScheduledTask(mActiveDeviceManager.getHandlerLooper());
         verify(mLeAudioService).setActiveDevice(isNull());
-        // Don't call mA2dpService.setActiveDevice()
-        verify(mA2dpService, never()).setActiveDevice(mA2dpHeadsetDevice);
+        verify(mA2dpService).setActiveDevice(mA2dpHeadsetDevice);
         Assert.assertEquals(mA2dpHeadsetDevice, mActiveDeviceManager.getA2dpActiveDevice());
         Assert.assertEquals(null, mActiveDeviceManager.getLeAudioActiveDevice());
     }
@@ -362,8 +361,7 @@ public class ActiveDeviceManagerTest {
 
         TestUtils.waitForLooperToFinishScheduledTask(mActiveDeviceManager.getHandlerLooper());
         verify(mLeAudioService).setActiveDevice(isNull());
-        // Don't call mLeAudioService.setActiveDevice()
-        verify(mLeAudioService, never()).setActiveDevice(mA2dpHeadsetDevice);
+        verify(mHeadsetService).setActiveDevice(mA2dpHeadsetDevice);
         Assert.assertEquals(mA2dpHeadsetDevice, mActiveDeviceManager.getHfpActiveDevice());
         Assert.assertEquals(null, mActiveDeviceManager.getLeAudioActiveDevice());
     }