diff options
| author | Chiou-Hao Hsu <chsu@codeaurora.org> | 2014-10-29 16:03:58 -0700 |
|---|---|---|
| committer | Chiou-Hao Hsu <chsu@codeaurora.org> | 2014-10-29 16:07:35 -0700 |
| commit | 0ac28dc49e2898738233d61ac03a9517926bca1a (patch) | |
| tree | bf83d78c5bcf762023cec26cbbcb51964dbda920 | |
| parent | 4274fd0bdfa7095b5092b38bad032d27cb53bff8 (diff) | |
| parent | c19f99b66ce6e8b92ed986548e06e99e7ca890f8 (diff) | |
| download | android_hardware_qcom_audio-0ac28dc49e2898738233d61ac03a9517926bca1a.tar.gz android_hardware_qcom_audio-0ac28dc49e2898738233d61ac03a9517926bca1a.tar.bz2 android_hardware_qcom_audio-0ac28dc49e2898738233d61ac03a9517926bca1a.zip | |
Merge tag 'AU_LINUX_ANDROID_LNX.LA.3.6.04.04.04.062.242' into HEAD
AU_LINUX_ANDROID_LNX.LA.3.6.04.04.04.062.242 based on quic/aosp/LNX.LA.3.6
Change-Id: Iff02564c0724ddca7f396fdbaf9820337cfbc112
| -rw-r--r-- | hal/audio_hw.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hal/audio_hw.c b/hal/audio_hw.c index 545a5484..1647b28f 100644 --- a/hal/audio_hw.c +++ b/hal/audio_hw.c @@ -668,7 +668,9 @@ int select_devices(struct audio_device *adev, audio_usecase_t uc_id) } } else if (voice_extn_compress_voip_is_active(adev)) { voip_usecase = get_usecase_from_list(adev, USECASE_COMPRESS_VOIP_CALL); - if ((voip_usecase) && (voip_usecase->devices & AUDIO_DEVICE_OUT_ALL_CODEC_BACKEND)) { + if ((voip_usecase) && (voip_usecase->devices & AUDIO_DEVICE_OUT_ALL_CODEC_BACKEND) && + (usecase->devices & AUDIO_DEVICE_OUT_ALL_CODEC_BACKEND) && + (voip_usecase->stream.out != adev->primary_output)) { in_snd_device = voip_usecase->in_snd_device; out_snd_device = voip_usecase->out_snd_device; } |