commit 0e3cb594a650a92af16b4b06867b6f03b3c9e9ee
author Linux Build Service Account <lnxbuild@quicinc.com> Tue Dec 05 21:33:47 2017 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Dec 05 21:33:47 2017 -0800
tree 00064b498b950b1136fef535d797db9dd8be2ace
parent fc3f73265e468beddaa42fcf4c6114b154ef96e4
parent 3251d2327288d8a408067a8ba2bec82bd7b3d49d

Merge "hal: Fix no audio during voice call with voip in background"

hal/voice.c

diff --git a/hal/voice.c b/hal/voice.c
index b3645be..f9e3562 100644
--- a/hal/voice.c
+++ b/hal/voice.c
@@ -216,8 +216,16 @@
 
     uc_info->id = usecase_id;
     uc_info->type = VOICE_CALL;
-    uc_info->stream.out = adev->current_call_output ;
-    uc_info->devices = adev->current_call_output ->devices;
+    uc_info->stream.out = adev->current_call_output;
+    uc_info->devices = adev->current_call_output->devices;
+
+    if (popcount(uc_info->devices) == 2) {
+        ALOGE("%s: Invalid combo device(%#x) for voice call", __func__,
+              uc_info->devices);
+        ret = -EIO;
+        goto error_start_voice;
+    }
+
     uc_info->in_snd_device = SND_DEVICE_NONE;
     uc_info->out_snd_device = SND_DEVICE_NONE;