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

Commit dce7dda3 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: da9f8303 

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



Change-Id: I4e7269aed84f6deb2681572b7d407561ad26eeb5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 82981571 da9f8303

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: