commit 968d681ff5dea0f360c94474bdaf014fdd982dc8
author Carter Hsu <carterhsu@google.com> Wed Jun 12 21:36:14 2019 +0800
committer Carter Hsu <carterhsu@google.com> Thu Jun 13 09:47:10 2019 +0800
tree 79a090807abb33f1215f4b3de3415f13daa2190e
parent 3ff768954a8d1ac1effc3a745f842b231f58a93c

audio: set hotword input for soundtrigger only

The sound_trigger session might have been paused while
soundtrigger client starts to record.

In this corner case, this input won't be detected as
soundtrigger input in audio HAL since the st_session handle
has been removed because the st_session is in pause state.

Then soundtrigger input will try to open pcm driver and
act as normal audio record, it will cause race condition
on pcm node.

To fix this, set the input with AUDIO_INPUT_FLAG_HW_HOTWORD
flag to be always soundtrigger input.

Bug: 135059114
Test: hotword/music detection works
Change-Id: I4475bfb1d3e2c9b998c583e9244c0aa4f07b2134
Signed-off-by: Carter Hsu <carterhsu@google.com>

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 5d611c6..34fafe7 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -4107,7 +4107,7 @@
 
     lock_input_stream(in);
 
-    if (!in->standby && in->is_st_session) {
+    if (!in->standby && (in->flags & AUDIO_INPUT_FLAG_HW_HOTWORD)) {
         ALOGV("%s: sound trigger pcm stop lab", __func__);
         audio_extn_sound_trigger_stop_lab(in);
         in->standby = true;
@@ -4347,7 +4347,7 @@
     const size_t frame_size = audio_stream_in_frame_size(stream);
     const size_t frames = bytes / frame_size;
 
-    if (in->is_st_session) {
+    if (in->flags & AUDIO_INPUT_FLAG_HW_HOTWORD) {
         ALOGVV(" %s: reading on st session bytes=%zu", __func__, bytes);
         /* Read from sound trigger HAL */
         audio_extn_sound_trigger_read(in, buffer, bytes);
@@ -4460,7 +4460,7 @@
     // on standby. Therefore, we may return an error even though the
     // pcm stream is still opened.
     if (in->standby) {
-        ALOGE_IF(in->pcm != NULL && !in->is_st_session,
+        ALOGE_IF(in->pcm != NULL && !(in->flags & AUDIO_INPUT_FLAG_HW_HOTWORD),
                  "%s stream in standby but pcm not NULL for non ST session", __func__);
         goto exit;
     }
@@ -6077,6 +6077,9 @@
        get sound trigger pcm if present */
     audio_extn_sound_trigger_check_and_get_session(in);
 
+    if (in->is_st_session)
+        in->flags |= AUDIO_INPUT_FLAG_HW_HOTWORD;
+
     lock_input_stream(in);
     audio_extn_snd_mon_register_listener(in, in_snd_mon_cb);
     pthread_mutex_lock(&adev->lock);