commit f2c4d58a87bd79843c06e6ed8629942436f8f557
author qctecmdr <qctecmdr@localhost> Thu Apr 16 23:48:31 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Apr 16 23:48:31 2020 -0700
tree 99b90cd60e59d55299e2b0245fba57e2b9197007
parent 16d97201eda0f3d411ad19fdc4f5a68f4fddf1a0
parent 47ea2f05dafe86371cf23d7a420d2aa886cef34a

Merge "a2dp: check out_snd_device to tear down a2dp path"

hal/audio_extn/a2dp.c

diff --git a/hal/audio_extn/a2dp.c b/hal/audio_extn/a2dp.c
index 00e581f..8422846 100644
--- a/hal/audio_extn/a2dp.c
+++ b/hal/audio_extn/a2dp.c
@@ -2875,8 +2875,10 @@
                     goto param_handled;
                 list_for_each(node, &a2dp.adev->usecase_list) {
                     uc_info = node_to_item(node, struct audio_usecase, list);
-                    if (uc_info->stream.out && uc_info->type == PCM_PLAYBACK &&
-                        is_a2dp_out_device_type(&uc_info->stream.out->device_list)) {
+                    if (uc_info->type == PCM_PLAYBACK &&
+                        (uc_info->out_snd_device == SND_DEVICE_OUT_BT_A2DP ||
+                         uc_info->out_snd_device == SND_DEVICE_OUT_SPEAKER_AND_BT_A2DP ||
+                         uc_info->out_snd_device == SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_A2DP)) {
                         pthread_mutex_unlock(&a2dp.adev->lock);
                         fp_check_a2dp_restore(a2dp.adev, uc_info->stream.out, false);
                         pthread_mutex_lock(&a2dp.adev->lock);