commit 5269691432805027b4ac9418e269b5fee98c9350
author The Android Automerger <android-build@google.com> Thu Oct 03 06:02:21 2013 -0700
committer The Android Automerger <android-build@google.com> Thu Oct 03 06:02:21 2013 -0700
tree bec8120b96e9f45eb430480800a078279ce33aa6
parent ed9c56ad071e5d0fb09ac7f310dc83a4553c1ad7
parent de517ba3e19fbf621b3d4d486d121bea25692e1a

merge in klp-release history after reset to klp-dev

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index c89d88e..c5e44aa 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -1220,7 +1220,7 @@
             }
         }
 
-        if ((adev->mode != AUDIO_MODE_IN_CALL) && adev->in_call &&
+        if ((adev->mode == AUDIO_MODE_NORMAL) && adev->in_call &&
                 (out == adev->primary_output)) {
             stop_voice_call(adev);
         }