commit ca36cb1c9009f16da60c75b18da381b6dc41f8a3
author Shiv Maliyappanahalli <smaliyap@codeaurora.org> Mon Aug 17 11:02:21 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Aug 21 17:43:23 2015 -0700
tree 019398588296c91a272c8dbfacd9d2e4c7903810
parent fd0afd9b111e32e66a61c49170e4d800fd673198

Revert "hal: Fix voice session setup failure"

Camera click tones are not playing while in voice calls and headset
is connected since get_output_devices doesnt return a valid device.
Fix by returning combo device speaker-and-headset when in voice call.

The original issue reported in CR859796, seem to customer specific,
as on internal platforms, there are no usecases such as
"volte-call speaker-and-headset".

This reverts commit 62d96d50dafae78818994425275a743b68d70881.

Change-Id: Ic8146d8ed5ab7312fa40242c5fda00996a27c083

hal/msm8916/platform.c

diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index 94967c8..cc74886 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -2413,7 +2413,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)