From b52764ee1dda1bca2d73c1546a125a879516a501 Mon Sep 17 00:00:00 2001
From: Jasmine Cha <chajasmine@google.com>
Date: Sat, 28 Mar 2020 12:39:12 +0100
Subject: [PATCH] miatoll: audio: Add hotword input for hotword mic concurrency

Bug: 126595113
Bug: 129733664
Bug: 133123985
Bug: 130316160

Test:
 (ST: sound trigger, VO: VoIP, PH: phone call,
  NR: media recording, PL: playback music)
 ST->VO (MO/MT),  ST->PH (MO/MT)
 ST->NR->PH (MO/MT), ST->NR->VO (MO/MT)
 ST->PL->PH (MO/MT), ST->PL->VO (MO/MT)
 ST->NR->PL->PH (MO/MT),  ST->NR->PL->VO (MO/MT)

Change-Id: I11513994c7a34364de38e00fc8ff999efe3dbb6c
Signed-off-by: Jasmine Cha <chajasmine@google.com>
---
 audio/audio_policy_configuration.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml
index c3c75d9..5b3a4a3 100755
--- a/audio/audio_policy_configuration.xml
+++ b/audio/audio_policy_configuration.xml
@@ -181,6 +181,11 @@
                              samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>
                 </mixPort>
+                <mixPort name="hotword input" role="sink" flags="AUDIO_INPUT_FLAG_HW_HOTWORD" maxActiveCount="0" >
+                    <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"/>
+                </mixPort>
                 <!--import xiaomi Preset(scenario select) patch end-->
                 <mixPort name="voip_tx" role="sink"
                          flags="AUDIO_INPUT_FLAG_VOIP_TX">
@@ -376,6 +381,8 @@
                 <!--import xiaomi Preset(scenario select) patch end-->
                 <route type="mix" sink="voip_tx"
                        sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In,Wired Headset Mic"/>
+                <route type="mix" sink="hotword input"
+                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,FM Tuner,Telephony Rx"/>
                 <route type="mix" sink="usb_surround_sound"
                        sources="USB Device In,USB Headset In"/>
                 <route type="mix" sink="record_24"