commit c25092d47e925c6ad9a87ea8ba01977fceab64dc
author Madhuri Athota <mathota@codeaurora.org> Thu Oct 13 23:36:21 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 13 23:36:21 2016 +0000
tree 159d1fff7acbec8fab8d4db52c4c3913e78ea70a
parent 7d881abcec4fbaaaf5e329d05487aafceb72ef3e
parent 3f6051b52e65adc33988afc17df5d2c2b9a8d01b

hal: select HFP devices based on hfp active session
am: 3f6051b52e

Change-Id: I1c694b71481a4be0ac901514430d73bcf266e22e

hal/msm8916/platform.c

diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index 5faa2b2..900a7e6 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -1547,7 +1547,7 @@
         goto exit;
     }
 
-    if (mode == AUDIO_MODE_IN_CALL) {
+    if (mode == AUDIO_MODE_IN_CALL || audio_extn_hfp_is_active(adev)) {
         if (devices & AUDIO_DEVICE_OUT_WIRED_HEADPHONE ||
             devices & AUDIO_DEVICE_OUT_WIRED_HEADSET ||
             devices & AUDIO_DEVICE_OUT_LINE) {

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index a890b61..62baf5b 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -1960,7 +1960,7 @@
         goto exit;
     }
 
-    if (voice_is_in_call(adev) || adev->enable_voicerx) {
+    if (voice_is_in_call(adev) || adev->enable_voicerx || audio_extn_hfp_is_active(adev)) {
         if (devices & AUDIO_DEVICE_OUT_WIRED_HEADPHONE ||
             devices & AUDIO_DEVICE_OUT_WIRED_HEADSET ||
             devices & AUDIO_DEVICE_OUT_LINE) {