Merge "Correct stream type for BLE input device"

2022-05-12 01:27:03 +00:00
parent fda1fe2400 bc41187257
commit 2c7275d641
1 changed files with 5 additions and 2 deletions
--- a/services/core/java/com/android/server/audio/AudioDeviceBroker.java
+++ b/services/core/java/com/android/server/audio/AudioDeviceBroker.java
@@ -1202,8 +1202,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: