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

Merge "Mirrors calls to suspend LE Audio with those for A2DP" am: 872e2a4194

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

Change-Id: I190080b139e193fd71695cabd5b44db9d85a64d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Rahul Sabnis
2023-03-31 01:23:39 +00:00
committed by Automerger Merge Worker
parent 5dfed9aaf5 872e2a4194
commit ff46cfd526
2 changed files with 7 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

@@ -1209,6 +1209,9 @@ public class AudioDeviceInventory {
"LE Audio device addr=" + address + " now available").printLog(TAG)); "LE Audio device addr=" + address + " now available").printLog(TAG));
} }
// Reset LEA suspend state each time a new sink is connected
mAudioSystem.setParameters("LeAudioSuspended=false");
mConnectedDevices.put(DeviceInfo.makeDeviceListKey(device, address), mConnectedDevices.put(DeviceInfo.makeDeviceListKey(device, address),
new DeviceInfo(device, name, address, AudioSystem.AUDIO_FORMAT_DEFAULT)); new DeviceInfo(device, name, address, AudioSystem.AUDIO_FORMAT_DEFAULT));
mDeviceBroker.postAccessoryPlugMediaUnmute(device); mDeviceBroker.postAccessoryPlugMediaUnmute(device);
@@ -1254,6 +1257,9 @@ public class AudioDeviceInventory {
@GuardedBy("mDevicesLock") @GuardedBy("mDevicesLock")
private void makeLeAudioDeviceUnavailableLater(String address, int device, int delayMs) { private void makeLeAudioDeviceUnavailableLater(String address, int device, int delayMs) {
// prevent any activity on the LEA output to avoid unwanted
// reconnection of the sink.
mAudioSystem.setParameters("LeAudioSuspended=true");
// the device will be made unavailable later, so consider it disconnected right away // the device will be made unavailable later, so consider it disconnected right away
mConnectedDevices.remove(DeviceInfo.makeDeviceListKey(device, address)); mConnectedDevices.remove(DeviceInfo.makeDeviceListKey(device, address));
// send the delayed message to make the device unavailable later // send the delayed message to make the device unavailable later

1
services/core/java/com/android/server/audio/BtHelper.java
View File

@@ -477,6 +477,7 @@ public class BtHelper {
mScoAudioState = SCO_STATE_INACTIVE; mScoAudioState = SCO_STATE_INACTIVE;
broadcastScoConnectionState(AudioManager.SCO_AUDIO_STATE_DISCONNECTED); broadcastScoConnectionState(AudioManager.SCO_AUDIO_STATE_DISCONNECTED);
AudioSystem.setParameters("A2dpSuspended=false"); AudioSystem.setParameters("A2dpSuspended=false");
AudioSystem.setParameters("LeAudioSuspended=false");
mDeviceBroker.setBluetoothScoOn(false, "resetBluetoothSco"); mDeviceBroker.setBluetoothScoOn(false, "resetBluetoothSco");
} }