commit aff330b2a1e37820b249d641b4b22a95092a108f
author Ravi Kumar Alamanda <ralama@codeaurora.org> Fri Sep 25 17:58:32 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 25 17:58:32 2015 +0000
tree dc4ad2f381b166724ca09a4c2a84b1e4ddde848b
parent c5a1eee907a7ac0fd31679a4d2489b27db911888
parent 04643599078ac0501b64493e791320277ac05a47

am 04643599: hal: Fix EC not working with some VoIP app

* commit '04643599078ac0501b64493e791320277ac05a47':
  hal: Fix EC not working with some VoIP app

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 3b8d6e0..d44eeb4 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -649,12 +649,13 @@
             out_snd_device = SND_DEVICE_NONE;
             if (in_snd_device == SND_DEVICE_NONE) {
                 audio_devices_t out_device = AUDIO_DEVICE_NONE;
-                if (adev->active_input->source == AUDIO_SOURCE_VOICE_COMMUNICATION &&
-                        adev->primary_output && !adev->primary_output->standby) {
-                    out_device = adev->primary_output->devices;
+                if (adev->active_input->source == AUDIO_SOURCE_VOICE_COMMUNICATION) {
                     platform_set_echo_reference(adev, false, AUDIO_DEVICE_NONE);
-                } else if (usecase->id == USECASE_AUDIO_RECORD_AFE_PROXY) {
-                    out_device = AUDIO_DEVICE_OUT_TELEPHONY_TX;
+                    if (usecase->id == USECASE_AUDIO_RECORD_AFE_PROXY) {
+                        out_device = AUDIO_DEVICE_OUT_TELEPHONY_TX;
+                    } else if (adev->primary_output) {
+                        out_device = adev->primary_output->devices;
+                    }
                 }
                 in_snd_device = platform_get_input_snd_device(adev->platform, out_device);
             }