Merge "Correct stream type for BLE input device" am: 2c7275d641

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

Change-Id: I2ac829ab63858a3988bf437e9741cdc653c13575
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kyunglyul Hyun
2022-05-12 02:31:07 +00:00
committed by Automerger Merge Worker

View File

@@ -1268,8 +1268,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: