commit f485dc022e222b48a09d188045c224563a0d09bb
author qctecmdr <qctecmdr@localhost> Sat May 22 23:42:20 2021 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat May 22 23:42:20 2021 -0700
tree c8c1f295ca35f69586f38f5502f8314fc651c069
parent 05405f2a522776bd7d5667b2e79045451d1ee8bf
parent cf77af0ab18911e6fde5ca7edba0b73696d90e62

Merge "hal: check for sco device to ensure a2dp can be disabled"

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 278a3e5..0855185 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -10508,14 +10508,15 @@
                 usecase = node_to_item(node, struct audio_usecase, list);
                 if ((usecase->type != PCM_CAPTURE) && (usecase != uc_info) &&
                     !is_a2dp_out_device_type(&usecase->stream.out->device_list) &&
+                    !is_sco_out_device_type(&usecase->stream.out->device_list) &&
                     platform_check_backends_match(SND_DEVICE_OUT_SPEAKER,
                                                   usecase->out_snd_device)) {
                     assign_devices(&out->device_list, &usecase->stream.out->device_list);
                     break;
                 }
             }
-            if (is_a2dp_out_device_type(&devices) &&
-                list_length(&devices) == 1) {
+            if ((is_a2dp_out_device_type(&devices) && list_length(&devices) == 1) ||
+                (uc_info->out_snd_device == SND_DEVICE_OUT_BT_A2DP)) {
                 out->a2dp_muted = true;
                 if (is_offload_usecase(out->usecase)) {
                     if (out->offload_state == OFFLOAD_STATE_PLAYING)