Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41fa371e authored by Kyunglyul Hyun's avatar Kyunglyul Hyun Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I2ac829ab63858a3988bf437e9741cdc653c13575
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3813698a 2c7275d6

services/core/java/com/android/server/audio/AudioDeviceBroker.java

+5 −2
Original line number Diff line number Diff line
@@ -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: