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

Commit facc0ea0 authored by Jack He's avatar Jack He Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Iab129909c6c3ca57fd788252bf12a6ac074539a7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fbcaaf44 950bc624

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

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