commit 39fcca0a503658f91a14b4b1d35dfc4ac9fce9d9
author Eric Laurent <elaurent@google.com> Fri Sep 05 16:44:19 2014 -0700
committer Eric Laurent <elaurent@google.com> Fri Sep 05 18:56:33 2014 -0700
tree eb8e6b29ccf8df89b697fcd7fc73433edb313153
parent b5928445d12d92598845bcef3cd019aa09acb12d

SoundTrigger: fix capture format in recognition event

Also include capture format in recognition event
if capture is available for streaming. It was only
included if trigger was contained in event.

Bug: 17409062
Bug: 16731718
Change-Id: I5bf566e6bda57f23c870b4a1293e9b6d15d51e5a

core/jni/android_hardware_SoundTrigger.cpp

diff --git a/core/jni/android_hardware_SoundTrigger.cpp b/core/jni/android_hardware_SoundTrigger.cpp
index f0d7a35..7b33bc2 100644
--- a/core/jni/android_hardware_SoundTrigger.cpp
+++ b/core/jni/android_hardware_SoundTrigger.cpp
@@ -211,7 +211,7 @@
     }
 
     jobject jAudioFormat = NULL;
-    if (event->trigger_in_data) {
+    if (event->trigger_in_data || event->capture_available) {
         jAudioFormat = env->NewObject(gAudioFormatClass,
                                     gAudioFormatCstor,
                                     audioFormatFromNative(event->audio_config.format),