Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I0e39b9f7cd5ca8b68bc00d42a342ff21c9939749
This commit is contained in:
Treehugger Robot
2022-01-15 07:08:10 +00:00
committed by Automerger Merge Worker
parent b0b2e115e2 94964fc768
commit 9101f31567
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/audio/AudioDeviceInventory.java
View File

@@ -1088,6 +1088,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),