commit e9867fff70a5b9122e58c11ec770280bb7de9045
author Linux Build Service Account <lnxbuild@localhost> Mon Mar 14 02:33:36 2016 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Mar 14 02:33:36 2016 -0700
tree f6805db82bf0afa96ae2cacca94fe3a7a2db83b1
parent a969a9b76775204bc44095e77d31a999dddd039f
parent fd7607b86e84922517423aa4dd6196c7040e95b2

Merge "hal: stop sound trigger buffering during close" into av-userspace.lnx.1.0-dev.1.0

hal/audio_extn/soundtrigger.c

diff --git a/hal/audio_extn/soundtrigger.c b/hal/audio_extn/soundtrigger.c
index 3c16c88..8882b90 100644
--- a/hal/audio_extn/soundtrigger.c
+++ b/hal/audio_extn/soundtrigger.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-2014, 2016 The Linux Foundation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -174,7 +174,7 @@
     struct sound_trigger_info  *st_ses_info = NULL;
     audio_event_info_t event;
 
-    if (!st_dev || !in)
+    if (!st_dev || !in || !in->is_st_session_active)
        return;
 
     pthread_mutex_lock(&st_dev->lock);
@@ -184,6 +184,7 @@
         event.u.ses_info = st_ses_info->st_ses;
         ALOGV("%s: AUDIO_EVENT_STOP_LAB pcm %p", __func__, st_ses_info->st_ses.pcm);
         st_dev->st_callback(AUDIO_EVENT_STOP_LAB, &event);
+        in->is_st_session_active = false;
     }
 }
 void audio_extn_sound_trigger_check_and_get_session(struct stream_in *in)

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 7ee27f5..fc7c84e 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -3834,6 +3834,10 @@
             audio_extn_compr_cap_format_supported(in->config.format))
         audio_extn_compr_cap_deinit();
 
+    if (in->is_st_session) {
+        ALOGV("%s: sound trigger pcm stop lab", __func__);
+        audio_extn_sound_trigger_stop_lab(in);
+    }
     free(stream);
     return;
 }