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

Commit 950bc624 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 

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



Change-Id: I6887b7b1e2a4ed41ad27838ea36688497e7eb57d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 56a4a118 8f114162

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

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