commit 6fe6bb246920ea2ff06147e78c93b830dc5febb2
author Lakshman Chaluvaraju <lchalu@codeaurora.org> Fri May 03 18:45:29 2019 +0530
committer Lakshman Chaluvaraju <lchalu@codeaurora.org> Fri May 03 18:56:21 2019 +0530
tree bd4df8deb86885bb502d4844b1f7e96c30a9dba2
parent 8a314f777c2d599988e457512a8bffe530db3a52

hal: Fix no audio during voice call with concurrent combo use case

-Music playback and voice use case uses snd device "voice-headphopne"
 as Rx device during active voice call, any new combo use case
 (camera shutter sound)gets routed to snd device "speaker" and 'headphone"
 during this state.
 When camera click sound is completed, it will end up disabling headphone
 device result in no audio on headphone for voice call.

 Add missing name to index conversion for voice-speaker and voice-headphone
 combo device to read required interface entry from audio platform
 info xml file.

CRs-Fixed: 2440086
Change-Id: Ib1ad49b9ef2da917da8e8af2fe5af1fa9e67ac2b

hal/msm8916/platform.c

diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index 27990a6..642919b 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -783,6 +783,10 @@
     {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_2_WSA)},
     {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_2_VBAT)},
     {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_HEADPHONES)},
+    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_HEADPHONES)},
+    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_ANC_HEADSET)},
+    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_AND_VOICE_HEADPHONES)},
+    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_AND_VOICE_ANC_HEADSET)},
     {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_LINE)},
     {TO_NAME_INDEX(SND_DEVICE_OUT_HDMI)},
     {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_HDMI)},

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 2ac3852..70c0386 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -785,6 +785,10 @@
     {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_2)},
     {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_2_VBAT)},
     {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_HEADPHONES)},
+    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_HEADPHONES)},
+    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_AND_VOICE_ANC_HEADSET)},
+    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_AND_VOICE_HEADPHONES)},
+    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_AND_VOICE_ANC_HEADSET)},
     {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_LINE)},
     {TO_NAME_INDEX(SND_DEVICE_OUT_HDMI)},
     {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_HDMI)},