commit 87665ea00db09e67f1fa5cf2a792f8edcdfc729b
author Ravi Kumar Alamanda <ralama@codeaurora.org> Fri Oct 02 15:35:34 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 02 15:35:34 2015 +0000
tree 6480c779e5f79628aa9149d86631e3ca265d1df9
parent 1d5943183745d6cd180b4fa71ff317dfcf3a7428
parent fb21e4e53923416672ebbf33910d3c4bea5d15f5

am fb21e4e5: am 888dc3d2: hal: fix hotword detection failure during music playback

* commit 'fb21e4e53923416672ebbf33910d3c4bea5d15f5':
  hal: fix hotword detection failure during music playback

hal/audio_extn/soundtrigger.c

diff --git a/hal/audio_extn/soundtrigger.c b/hal/audio_extn/soundtrigger.c
index 4d09387..b5475a1 100644
--- a/hal/audio_extn/soundtrigger.c
+++ b/hal/audio_extn/soundtrigger.c
@@ -209,12 +209,14 @@
        return;
 
     if (snd_device >= SND_DEVICE_OUT_BEGIN &&
-        snd_device < SND_DEVICE_OUT_END)
+        snd_device < SND_DEVICE_OUT_END) {
         device_type = PCM_PLAYBACK;
-    else if (snd_device >= SND_DEVICE_IN_BEGIN &&
-        snd_device < SND_DEVICE_IN_END)
+    } else if (snd_device >= SND_DEVICE_IN_BEGIN &&
+        snd_device < SND_DEVICE_IN_END) {
+        if (snd_device == SND_DEVICE_IN_CAPTURE_VI_FEEDBACK)
+            return;
         device_type = PCM_CAPTURE;
-    else {
+    } else {
         ALOGE("%s: invalid device 0x%x, for event %d",
                            __func__, snd_device, event);
         return;