commit 2bd38a9ad79c9891dda331dd676f0fbdbdf035ae
author Linux Build Service Account <lnxbuild@localhost> Tue Apr 28 00:53:32 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Apr 28 00:53:32 2020 -0700
tree 2197a8dfc921fd738e431553b1a2d5df64e19667
parent 0f7d11bbaeded3bc314e8e52b85660f31541ef6f
parent 3575d18d658c4b008cdc0fd6130f48baa8a8e3cd

Merge "st-hal: fix session in active even when concurrency disabled"

sound_trigger_platform.c

diff --git a/sound_trigger_platform.c b/sound_trigger_platform.c
index 24e82f0..18e59e2 100644
--- a/sound_trigger_platform.c
+++ b/sound_trigger_platform.c
@@ -4693,9 +4693,12 @@
                 num_sessions > stdev->rx_conc_max_st_ses)
                 concurrency_ses_allowed = false;
         }
-        if (concurrency_ses_allowed && stdev->conc_capture_supported) {
-            if ((!stdev->conc_voice_call_supported && stdev->conc_voice_active) ||
-                (!stdev->conc_voip_call_supported && stdev->conc_voip_active))
+        if (concurrency_ses_allowed) {
+            if ((!stdev->conc_capture_supported &&
+                 stdev->tx_concurrency_active > 0) ||
+                (stdev->conc_capture_supported &&
+                 ((!stdev->conc_voice_call_supported && stdev->conc_voice_active) ||
+                  (!stdev->conc_voip_call_supported && stdev->conc_voip_active))))
                 concurrency_ses_allowed = false;
         }
     } else {