diff options
| author | 2022-05-11 00:27:46 +0000 | |
|---|---|---|
| committer | 2022-05-11 00:27:46 +0000 | |
| commit | e365741d195776c630a76cc895f3e8883b03c46c (patch) | |
| tree | 1d7cf31e0d6fd675f9ead08b75c9e302551daaf4 | |
| parent | c4ebdc497fc7815a010830a88c5880a4991ff502 (diff) | |
| parent | 8f114162f4e242b88f6611a510a882262adf010b (diff) | |
Merge "Correct stream type for BLE input device" into tm-dev am: 8f114162f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17951713
Change-Id: Ia8fc1c72cf2feef03e790d462743763ea0651c22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/audio/AudioDeviceBroker.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/audio/AudioDeviceBroker.java b/services/core/java/com/android/server/audio/AudioDeviceBroker.java index 3b715a218e5d..03dcc8d711d3 100644 --- a/services/core/java/com/android/server/audio/AudioDeviceBroker.java +++ b/services/core/java/com/android/server/audio/AudioDeviceBroker.java @@ -1289,8 +1289,11 @@ import java.util.concurrent.atomic.AtomicBoolean; break; case MSG_L_SET_BT_ACTIVE_DEVICE: synchronized (mDeviceStateLock) { - mDeviceInventory.onSetBtActiveDevice((BtDeviceInfo) msg.obj, - mAudioService.getBluetoothContextualVolumeStream()); + BtDeviceInfo btInfo = (BtDeviceInfo) msg.obj; + mDeviceInventory.onSetBtActiveDevice(btInfo, + (btInfo.mProfile != BluetoothProfile.LE_AUDIO || btInfo.mIsLeOutput) + ? mAudioService.getBluetoothContextualVolumeStream() + : AudioSystem.STREAM_DEFAULT); } break; case MSG_BT_HEADSET_CNCT_FAILED: |