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

Merge "Correct stream type for BLE input device" into tm-dev am: 8f114162f4

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

Change-Id: I6887b7b1e2a4ed41ad27838ea36688497e7eb57d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jack He
2022-05-11 00:28:31 +00:00
committed by Automerger Merge Worker
parent 56a4a118bd 8f114162f4
commit 950bc624d3
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/audio/AudioDeviceBroker.java
View File

@@ -1289,8 +1289,11 @@ import java.util.concurrent.atomic.AtomicBoolean;
break; break;
case MSG_L_SET_BT_ACTIVE_DEVICE: case MSG_L_SET_BT_ACTIVE_DEVICE:
synchronized (mDeviceStateLock) { synchronized (mDeviceStateLock) {
mDeviceInventory.onSetBtActiveDevice((BtDeviceInfo) msg.obj, BtDeviceInfo btInfo = (BtDeviceInfo) msg.obj;
mAudioService.getBluetoothContextualVolumeStream()); mDeviceInventory.onSetBtActiveDevice(btInfo,
(btInfo.mProfile != BluetoothProfile.LE_AUDIO || btInfo.mIsLeOutput)
? mAudioService.getBluetoothContextualVolumeStream()
: AudioSystem.STREAM_DEFAULT);
} }
break; break;
case MSG_BT_HEADSET_CNCT_FAILED: case MSG_BT_HEADSET_CNCT_FAILED: