From 52e4e987f81227d0a876c97c9dff89d21c4fae19 Mon Sep 17 00:00:00 2001
From: Danny Wood <danwood76@gmail.com>
Date: Thu, 20 May 2021 09:41:02 +0100
Subject: [PATCH] universal7580: remove unsupported devices from
 audio_policy_configuration.xml

* fixes intermittent audio failures

Change-Id: I7234e30f4b08aa31d9fb0721ada9a174609473dc
---
 configs/audio/audio_policy_configuration.xml | 40 ++++----------------
 1 file changed, 8 insertions(+), 32 deletions(-)

diff --git a/configs/audio/audio_policy_configuration.xml b/configs/audio/audio_policy_configuration.xml
index 08a6133..f2f6517 100644
--- a/configs/audio/audio_policy_configuration.xml
+++ b/configs/audio/audio_policy_configuration.xml
@@ -12,7 +12,6 @@
                 <item>Speaker</item>
                 <item>Built-In Mic</item>
                 <item>Built-In Back Mic</item>
-                <item>Voice Call Mic</item>
             </attachedDevices>
 
             <defaultOutputDevice>Speaker</defaultOutputDevice>
@@ -24,18 +23,12 @@
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
 
-                <mixPort name="fast" role="source" flags="AUDIO_OUTPUT_FLAG_FAST">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-
                 <!-- Capture(Input) Streams -->
                 <mixPort name="primary-in" role="sink">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_VOICE_UPLINK,AUDIO_CHANNEL_IN_VOICE_DNLINK"/>
                 </mixPort>
-
             </mixPorts>
 
             <devicePorts>
@@ -56,10 +49,6 @@
                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </devicePort>
-                <devicePort tagName="Dock Headset" role="sink" type="AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET">
-                   <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                            samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </devicePort>
                 <devicePort tagName="Bt Sco" role="sink" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO">
                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
@@ -94,39 +83,26 @@
                              samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_IN_VOICE_UPLINK,AUDIO_CHANNEL_IN_VOICE_DNLINK"/>
                 </devicePort>
-                <devicePort tagName="Voice Call Mic" type="AUDIO_DEVICE_IN_VOICE_CALL" role="source">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_IN_VOICE_UPLINK,AUDIO_CHANNEL_IN_VOICE_DNLINK"/>
-                </devicePort>
-                <devicePort tagName="FM Mic" type="AUDIO_DEVICE_IN_FM_TUNER" role="source">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_IN_VOICE_UPLINK,AUDIO_CHANNEL_IN_VOICE_DNLINK"/>
-                </devicePort>
-
             </devicePorts>
 
             <routes>
                 <route sink="Earpiece" type="mix"
-                       sources="primary-out,fast"/>
+                       sources="primary-out"/>
                 <route sink="Speaker" type="mix"
-                       sources="primary-out,fast"/>
+                       sources="primary-out"/>
                 <route sink="Wired Headset" type="mix"
-                       sources="primary-out,fast"/>
+                       sources="primary-out"/>
                 <route sink="Wired Headphone" type="mix"
-                       sources="primary-out,fast"/>
-                <route sink="Dock Headset" type="mix"
-                       sources="primary-out,fast"/>
+                       sources="primary-out"/>
                 <route sink="Bt Sco" type="mix"
-                       sources="primary-out,fast"/>
+                       sources="primary-out"/>
                 <route sink="Bt Sco Headset" type="mix"
-                       sources="primary-out,fast"/>
+                       sources="primary-out"/>
                 <route sink="Bt Sco Car Kit" type="mix"
-                       sources="primary-out,fast"/>
+                       sources="primary-out"/>
 
                 <route sink="primary-in" type="mix"
-                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,Bt Sco Headset Mic,Voice Call Mic,FM Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,Bt Sco Headset Mic"/>
 
             </routes>
         </module>
-- 
2.20.1