summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRavi Kumar Alamanda <ralama@codeaurora.org>2015-09-25 17:58:32 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-25 17:58:32 +0000
commitaff330b2a1e37820b249d641b4b22a95092a108f (patch)
treedc4ad2f381b166724ca09a4c2a84b1e4ddde848b
parentc5a1eee907a7ac0fd31679a4d2489b27db911888 (diff)
parent04643599078ac0501b64493e791320277ac05a47 (diff)
downloadandroid_hardware_qcom_audio-aff330b2a1e37820b249d641b4b22a95092a108f.tar.gz
android_hardware_qcom_audio-aff330b2a1e37820b249d641b4b22a95092a108f.tar.bz2
android_hardware_qcom_audio-aff330b2a1e37820b249d641b4b22a95092a108f.zip
am 04643599: hal: Fix EC not working with some VoIP app
* commit '04643599078ac0501b64493e791320277ac05a47': hal: Fix EC not working with some VoIP app
-rw-r--r--hal/audio_hw.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 3b8d6e08..d44eeb45 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -649,12 +649,13 @@ int select_devices(struct audio_device *adev,
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);
}