commit 285f307cbc7e6205b2fb9ee00609e24f0be4b46a
author Madhuri Athota <mathota@codeaurora.org> Thu Oct 13 23:39:50 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 13 23:39:50 2016 +0000
tree 7f2e81555ed1f250c25ea8cb3e3a6f3237f38d80
parent 30c97722c488bbf366d19532194c71a2ab6168ec
parent c25092d47e925c6ad9a87ea8ba01977fceab64dc

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

Change-Id: Ide4a3227a6d422084b6f5f8fcf07234e15fbce97

hal/msm8916/platform.c

diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index b855e2e..39617a9 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 e3a9518..4cc5bc1 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -1961,7 +1961,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) {