From 198163984bb6e2f2301d85e35e627f43db95c832 Mon Sep 17 00:00:00 2001
From: Eric Laurent <elaurent@google.com>
Date: Tue, 21 Sep 2021 20:21:34 +0200
Subject: [PATCH] sm6250-common: audio: do not use direct flag for voip rx
 output

Dedicated output profile for VoIP should not be a direct output as
it prevents from playing two audio tracks simultaneously which breaks
call signalling played on top of Rx call audio.

Bug: 64392515
Test: Fi call, Duo Calls
Change-Id: I4e62ba3be3da079ff32be9b92d5d5fa28e0f5e2b
[dereference23: Apply the change to audio_io_policy.conf as well]
Signed-off-by: Alexander Winkowski <dereference23@outlook.com>
---
 audio/audio_io_policy.conf           | 2 +-
 audio/audio_policy_configuration.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/audio/audio_io_policy.conf b/audio/audio_io_policy.conf
index de5d188..8fa611b 100644
--- a/audio/audio_io_policy.conf
+++ b/audio/audio_io_policy.conf
@@ -33,7 +33,7 @@ outputs {
     app_type 69943
   }
   voip_rx {
-    flags AUDIO_OUTPUT_FLAG_VOIP_RX|AUDIO_OUTPUT_FLAG_DIRECT
+    flags AUDIO_OUTPUT_FLAG_VOIP_RX
     formats AUDIO_FORMAT_PCM_16_BIT
     sampling_rates 8000|16000|32000|48000
     bit_width 16
diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml
index 86c1906..3f69a97 100644
--- a/audio/audio_policy_configuration.xml
+++ b/audio/audio_policy_configuration.xml
@@ -60,9 +60,9 @@
             <defaultOutputDevice>Speaker</defaultOutputDevice>
             <mixPorts>
                 <mixPort name="voip_rx" role="source"
-                         flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_VOIP_RX">
+                         flags="AUDIO_OUTPUT_FLAG_VOIP_RX">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
+                             samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
                 <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_FAST|AUDIO_OUTPUT_FLAG_PRIMARY">
                     <profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"