diff options
| author | Eric Laurent <elaurent@google.com> | 2014-09-07 19:10:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-07 19:10:07 +0000 |
| commit | 8232d822aa97e78e982ed154ac618cde34baac2a (patch) | |
| tree | 411b05e4021d419f430d78316d1c9a63fcec70df /core/jni | |
| parent | b30c9920df9a8b5f1515e26c65c5ce1d21e5a77a (diff) | |
| parent | 39fcca0a503658f91a14b4b1d35dfc4ac9fce9d9 (diff) | |
| download | frameworks_base-8232d822aa97e78e982ed154ac618cde34baac2a.zip frameworks_base-8232d822aa97e78e982ed154ac618cde34baac2a.tar.gz frameworks_base-8232d822aa97e78e982ed154ac618cde34baac2a.tar.bz2 | |
Merge "SoundTrigger: fix capture format in recognition event" into lmp-dev
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/android_hardware_SoundTrigger.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ void JNISoundTriggerCallback::onRecognitionEvent(struct sound_trigger_recognitio } 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), |