commit 66ef06aa1f105c962dc3a715a80b9c3e0537dbc0
author Eric Laurent <elaurent@google.com> Tue Feb 26 18:23:22 2019 -0800
committer Eric Laurent <elaurent@google.com> Tue Feb 26 18:23:22 2019 -0800
tree ce3370126f046ec831ee773af9d15ad3eb2171a9
parent 2da691987f1e5664f104567a94f3c661d0c4a66e

soundtrigger JNI: fix AudioFormat channel mask

Bug: 115507927
Test: OK google detection
Change-Id: Ic1dd6bd814a1f1efbbf7d476d8426e9aa65a7906

core/jni/android_hardware_SoundTrigger.cpp

diff --git a/core/jni/android_hardware_SoundTrigger.cpp b/core/jni/android_hardware_SoundTrigger.cpp
index 8a28034..c7805ea 100644
--- a/core/jni/android_hardware_SoundTrigger.cpp
+++ b/core/jni/android_hardware_SoundTrigger.cpp
@@ -221,12 +221,23 @@
 
     jobject jAudioFormat = NULL;
     if (event->trigger_in_data || event->capture_available) {
+        jint channelMask = (jint)audio_channel_mask_get_bits(event->audio_config.channel_mask);
+        jint channelIndexMask = (jint)AUDIO_CHANNEL_NONE;
+
+        switch (audio_channel_mask_get_representation(event->audio_config.channel_mask)) {
+        case AUDIO_CHANNEL_REPRESENTATION_INDEX:
+            channelIndexMask = channelMask;
+            channelMask = (jint)AUDIO_CHANNEL_NONE;
+            break;
+        default:
+            break;
+        }
         jAudioFormat = env->NewObject(gAudioFormatClass,
                                     gAudioFormatCstor,
                                     audioFormatFromNative(event->audio_config.format),
                                     event->audio_config.sample_rate,
-                                    inChannelMaskFromNative(event->audio_config.channel_mask),
-                                    (jint)0 /* channelIndexMask */);
+                                    channelMask,
+                                    channelIndexMask);
 
     }
     if (event->type == SOUND_MODEL_TYPE_KEYPHRASE) {