commit e07979800064b11b81c97a6929d63400cd345b39
author William Escande <wescande@google.com> Thu Mar 24 12:35:14 2022 +0100
committer William Escande <wescande@google.com> Wed Mar 30 07:56:06 2022 +0000
tree 0d3112c64f2e84f2f43ec5005ab0cfba9a58116f
parent 6179d11af87e72ea566b47dab426c3121198e759

Stop audio after call without disconnecting device

`removeActiveDevice(ACTIVE_DEVICE_ALL)` is removing the active device
from all sound profiles. (a2dp, hfp, le_audio, hearing aid).
The telecom BluetoothDeviceManager should not interract with the current
bluetooth active device.

Fix: 222229401
Test: No device to test - need external testing
Change-Id: I11850bf221a36e4e3846b148020807a250db4126

src/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java

diff --git a/src/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java b/src/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java
index 2785739..e5706d2 100644
--- a/src/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java
+++ b/src/com/android/server/telecom/bluetooth/BluetoothDeviceManager.java
@@ -382,16 +382,8 @@
     }
 
     public void disconnectAudio() {
-        if (mBluetoothAdapter != null) {
-            for (BluetoothDevice device: mBluetoothAdapter.getActiveDevices(
-                        BluetoothProfile.HEARING_AID)) {
-                if (device != null) {
-                    mBluetoothAdapter.removeActiveDevice(BluetoothAdapter.ACTIVE_DEVICE_ALL);
-                }
-            }
-            disconnectSco();
-            clearLeAudioCommunicationDevice();
-        }
+        disconnectSco();
+        clearLeAudioCommunicationDevice();
     }
 
     public void disconnectSco() {

tests/src/com/android/server/telecom/tests/BluetoothDeviceManagerTest.java

diff --git a/tests/src/com/android/server/telecom/tests/BluetoothDeviceManagerTest.java b/tests/src/com/android/server/telecom/tests/BluetoothDeviceManagerTest.java
index f011f0c..a9851bf 100644
--- a/tests/src/com/android/server/telecom/tests/BluetoothDeviceManagerTest.java
+++ b/tests/src/com/android/server/telecom/tests/BluetoothDeviceManagerTest.java
@@ -367,7 +367,6 @@
                 .thenReturn(Arrays.asList(device2, null));
 
         mBluetoothDeviceManager.disconnectAudio();
-        verify(mAdapter).removeActiveDevice(BluetoothAdapter.ACTIVE_DEVICE_ALL);
         verify(mBluetoothHeadset).disconnectAudio();
     }