commit 6d6b75806e4e77e0816879d92055bf454534aab2
author Linux Build Service Account <lnxbuild@localhost> Wed Aug 26 15:56:25 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Aug 26 15:56:25 2015 -0700
tree a173bab732d2ab086b87e09287c7f9562d6b8a8a
parent d33629dbd31a0d6c2fba4c24e9dffedb7bd0b973
parent ca36cb1c9009f16da60c75b18da381b6dc41f8a3

Merge "Revert "hal: Fix voice session setup failure""

hal/msm8916/platform.c

diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index b3943fd..1133790 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -2428,7 +2428,7 @@
         goto exit;
     }
 
-    if (popcount(devices) == 2 && !voice_is_in_call(adev)) {
+    if (popcount(devices) == 2) {
         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 f2d975f..142a85d 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -2049,7 +2049,7 @@
         goto exit;
     }
 
-    if (popcount(devices) == 2 && !voice_is_in_call(adev)) {
+    if (popcount(devices) == 2) {
         if (devices == (AUDIO_DEVICE_OUT_WIRED_HEADPHONE |
                         AUDIO_DEVICE_OUT_SPEAKER)) {
             if (my_data->external_spk_1)