From 961bc806e0e1336ac158f0d97e47b6b12bd1ff33 Mon Sep 17 00:00:00 2001
From: Kyunglyul Hyun <klhyun@google.com>
Date: Wed, 27 Apr 2022 18:55:28 +0900
Subject: [PATCH] Correct stream type for BLE input device

Correct the stream type of an active BLE input device
as STREAM_DEFAULT.

Bug: 230556991
Test: Switching BLE -> Phone -> BLE to check if Blutooth volume
is recovered (A2DP is tested as well to ensure no regression)

Change-Id: I0dc289d9b670133928513aa5e5c1edd240351aef
---
 .../java/com/android/server/audio/AudioDeviceBroker.java   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/audio/AudioDeviceBroker.java b/services/core/java/com/android/server/audio/AudioDeviceBroker.java
index 0b3c18b5113b3..c137a021c64f9 100644
--- a/services/core/java/com/android/server/audio/AudioDeviceBroker.java
+++ b/services/core/java/com/android/server/audio/AudioDeviceBroker.java
@@ -1284,8 +1284,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: