Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3cbec1b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 2fad508b 6fe6bb24

hal/msm8916/platform.c

+4 −0
Original line number Diff line number Diff line
@@ -783,6 +783,10 @@ static struct name_to_index snd_device_name_index[SND_DEVICE_MAX] = { 
    {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

+4 −0
Original line number Diff line number Diff line
@@ -785,6 +785,10 @@ static struct name_to_index snd_device_name_index[SND_DEVICE_MAX] = { 
    {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)},