Merge "AudioDeviceInventory: Fix for switching leaudio active/inactive" am: 810cf114cd am: 94964fc768 am: 9101f31567

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

Change-Id: Ie7ff2e152595480e30adc292b1373ada70d27f3b
This commit is contained in:
Treehugger Robot
2022-01-15 07:18:56 +00:00
committed by Automerger Merge Worker

View File

@@ -1091,6 +1091,12 @@ public class AudioDeviceInventory {
private void makeLeAudioDeviceAvailable(String address, String name, int streamType, int device, private void makeLeAudioDeviceAvailable(String address, String name, int streamType, int device,
String eventSource) { String eventSource) {
if (device != AudioSystem.DEVICE_NONE) { 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, AudioSystem.setDeviceConnectionState(device, AudioSystem.DEVICE_STATE_AVAILABLE,
address, name, AudioSystem.AUDIO_FORMAT_DEFAULT); address, name, AudioSystem.AUDIO_FORMAT_DEFAULT);
mConnectedDevices.put(DeviceInfo.makeDeviceListKey(device, address), mConnectedDevices.put(DeviceInfo.makeDeviceListKey(device, address),