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

Commit 25bfecaf authored by Jasmine Cha's avatar Jasmine Cha Committed by Cyan_Hsieh
Browse files

audio: correct routing order for voip output 



Routing primary output before voip_rx output will cause unexpected
RX/TX path suddenly and unmuted voice stream during when system
plays touch sound and switches path between handset and handsfree.

Bug: 154290829
Test: manual test in VoIP

Signed-off-by: default avatarJasmine Cha <chajasmine@google.com>
Change-Id: Ia60802ec887f0dfeaa0f93d151ba2f2c50e0d41d
parent 6152ab65

audio/audio_policy_configuration.xml

+5 −5
Original line number Diff line number Diff line
@@ -30,6 +30,11 @@ 
            </attachedDevices>

            <defaultOutputDevice>Speaker</defaultOutputDevice>

            <mixPorts>

                <mixPort name="voip_rx" role="source"

                         flags="AUDIO_OUTPUT_FLAG_VOIP_RX">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                           samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY|AUDIO_OUTPUT_FLAG_FAST">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
@@ -68,11 +73,6 @@ 
                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="voip_rx" role="source"

                         flags="AUDIO_OUTPUT_FLAG_VOIP_RX">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                           samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="incall_music_uplink" role="source"

                        flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"