commit d21521cad7f654e825c88a5bf3860459de519a7f
author Quinn Male <qmale@codeaurora.org> Tue May 19 10:58:26 2020 -0700
committer Quinn Male <qmale@codeaurora.org> Tue May 19 10:58:26 2020 -0700
tree 7d24b921b910818ec0d486c93ec1bfd7588df684
parent 5696a5b6fa7de45aca52123c1db6e18140622014

st-hal: Fix handling of audio capture concurrency events

The interface between ahal and sthal changed to send an
event payload for device events. This caused an issue with
handling device events in sthal. This fix resolves the issue.

Change-Id: I55466c502120171365d6c4885bb05eaa121be037

sound_trigger_platform.c

diff --git a/sound_trigger_platform.c b/sound_trigger_platform.c
index 8441659..7439064 100644
--- a/sound_trigger_platform.c
+++ b/sound_trigger_platform.c
@@ -4648,8 +4648,34 @@
     }
     stdev = my_data->stdev;
 
-    /* handle CAPTURE_STREAM events */
-    if (config) {
+    if (event_type == AUDIO_EVENT_CAPTURE_DEVICE_ACTIVE ||
+        event_type == AUDIO_EVENT_CAPTURE_DEVICE_INACTIVE) {
+        /* handle CAPTURE_DEVICE events */
+        ALOGI("%s: Received DEVICE event, event type %d",
+              __func__, event_type);
+        /*
+         * for device status events, if:
+         * 1. conc audio disabled - return with false to disable VA sessions
+         * 2. conc audio enabled - due to use case type unknown, return with
+         *    current decision
+         */
+        switch (event_type) {
+            case AUDIO_EVENT_CAPTURE_DEVICE_ACTIVE:
+                stdev->tx_concurrency_active++;
+                break;
+            case AUDIO_EVENT_CAPTURE_DEVICE_INACTIVE:
+                if (stdev->tx_concurrency_active > 0)
+                    stdev->tx_concurrency_active--;
+                break;
+            default:
+                break;
+        }
+        if (stdev->conc_capture_supported)
+            concurrency_ses_allowed = stdev->session_allowed;
+        else if (stdev->tx_concurrency_active > 0)
+            concurrency_ses_allowed = false;
+    } else {
+        /* handle CAPTURE_STREAM events */
         ALOGI("%s: Received STREAM event, event type %d, usecase type %d",
               __func__, event_type, config->u.usecase.type);
         switch (event_type) {
@@ -4702,31 +4728,6 @@
                   (!stdev->conc_voip_call_supported && stdev->conc_voip_active))))
                 concurrency_ses_allowed = false;
         }
-    } else {
-        /* handle CAPTURE_DEVICE events */
-        ALOGI("%s: Received DEVICE event, event type %d",
-              __func__, event_type);
-        /*
-         * for device status events, if:
-         * 1. conc audio disabled - return with false to disable VA sessions
-         * 2. conc audio enabled - due to use case type unknown, return with
-         *    current decision
-         */
-        switch (event_type) {
-            case AUDIO_EVENT_CAPTURE_DEVICE_ACTIVE:
-                stdev->tx_concurrency_active++;
-                break;
-            case AUDIO_EVENT_CAPTURE_DEVICE_INACTIVE:
-                if (stdev->tx_concurrency_active > 0)
-                    stdev->tx_concurrency_active--;
-                break;
-            default:
-                break;
-        }
-        if (stdev->conc_capture_supported)
-            concurrency_ses_allowed = stdev->session_allowed;
-        else if (stdev->tx_concurrency_active > 0)
-            concurrency_ses_allowed = false;
     }
 
     /*