Merge "AudioDeviceInventory: Fix for switching leaudio active/inactive" am:...

Merge "AudioDeviceInventory: Fix for switching leaudio active/inactive" am: 810cf114 am: 94964fc7 am: 9101f315

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1928153

Change-Id: Ie7ff2e152595480e30adc292b1373ada70d27f3b

services/core/java/com/android/server/audio/AudioDeviceInventory.java

@@ -1091,6 +1091,12 @@ public class AudioDeviceInventory {
     private void makeLeAudioDeviceAvailable(String address, String name, int streamType, int device,
             String eventSource) {
         if (device != AudioSystem.DEVICE_NONE) {
+
+            /* Audio Policy sees Le Audio similar to A2DP. Let's make sure
+             * AUDIO_POLICY_FORCE_NO_BT_A2DP is not set
+             */
+            mDeviceBroker.setBluetoothA2dpOnInt(true, false /*fromA2dp*/, eventSource);
+
             AudioSystem.setDeviceConnectionState(device, AudioSystem.DEVICE_STATE_AVAILABLE,
                     address, name, AudioSystem.AUDIO_FORMAT_DEFAULT);
             mConnectedDevices.put(DeviceInfo.makeDeviceListKey(device, address),