commit 87e4624f5721c737771568b775b9755f4c402081
author Linux Build Service Account <lnxbuild@localhost> Fri Jul 03 15:54:26 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Jul 03 15:54:26 2015 -0700
tree 7a599382e2221edf479ecaeb3f50683252815f6e
parent 26787462994babeac8582e1c21256fd7cdee3547
parent db4e1f0f2e8596bef64e8b797d4963de04ebf8be

Merge "hal: Fix voice session setup failure"

hal/msm8916/platform.c

diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index bb229b8..9f64969 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -2009,7 +2009,7 @@
         goto exit;
     }
 
-    if (popcount(devices) == 2) {
+    if (popcount(devices) == 2 && !voice_is_in_call(adev)) {
         if (devices == (AUDIO_DEVICE_OUT_WIRED_HEADPHONE |
                         AUDIO_DEVICE_OUT_SPEAKER)) {
             if (my_data->external_spk_1)

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index b30eb97..fb39d94 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -2019,7 +2019,7 @@
         goto exit;
     }
 
-    if (popcount(devices) == 2) {
+    if (popcount(devices) == 2 && !voice_is_in_call(adev)) {
         if (devices == (AUDIO_DEVICE_OUT_WIRED_HEADPHONE |
                         AUDIO_DEVICE_OUT_SPEAKER)) {
             if (my_data->external_spk_1)