commit 6ef13ce4b6ec47836cb39d1904a97e1d79abf4f4
author Linux Build Service Account <lnxbuild@localhost> Tue Jul 08 16:08:35 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Jul 08 16:08:35 2014 -0700
tree 290cf753edbf75197603056627af48f1123dc952
parent a0e066a58098668d2be50608a63e5423ecbcc517
parent 4d6167d205d60bea0214a63f660628e46fb19436

Merge "hal: Permit device switch for primary output in a voip call"

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index a357e98..d5c61f8 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -666,7 +666,8 @@
         } else if (voice_extn_compress_voip_is_active(adev)) {
             voip_usecase = get_usecase_from_list(adev, USECASE_COMPRESS_VOIP_CALL);
             if ((voip_usecase->devices & AUDIO_DEVICE_OUT_ALL_CODEC_BACKEND) &&
-                (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;
             }