From 2a375b2ddb5129f2cffaa1e109576b007d355f54 Mon Sep 17 00:00:00 2001
From: Rios Kao <rioskao@google.com>
Date: Thu, 13 Apr 2023 09:17:32 +0000
Subject: [PATCH] shusky: add sound_trigger_tap and hotword_lookback_capture

note: add path for new use-case
      sync diff from P22.

Test: end-to-end test with test apk
Bug: 259455755

Change-Id: Ia4b23782b6e08258450d3c7ca5624ea387add529
---
 .../audio_policy_configuration.xml            |  12 +
 audio/husky/aidl_config/mixer_paths_aidl.xml  | 307 ++++++------------
 .../audio_policy_configuration.xml            |  12 +
 audio/shiba/aidl_config/mixer_paths_aidl.xml  | 307 ++++++------------
 4 files changed, 214 insertions(+), 424 deletions(-)

diff --git a/audio/husky/aidl_config/audio_policy_configuration.xml b/audio/husky/aidl_config/audio_policy_configuration.xml
index dfc8577..c93d1cb 100644
--- a/audio/husky/aidl_config/audio_policy_configuration.xml
+++ b/audio/husky/aidl_config/audio_policy_configuration.xml
@@ -104,6 +104,16 @@
             samplingRates="16000"
             channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO" />
         </mixPort>
+        <mixPort name="hotword tap" role="sink" flags="AUDIO_INPUT_FLAG_HOTWORD_TAP">
+          <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+            samplingRates="16000"
+            channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO" />
+        </mixPort>
+        <mixPort name="hotword lookback" role="sink" flags="AUDIO_INPUT_FLAG_HOTWORD_TAP AUDIO_INPUT_FLAG_HW_LOOKBACK">
+          <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+            samplingRates="16000"
+            channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO" />
+        </mixPort>
         <!-- <mixPort name="mmap capture" role="sink" flags="AUDIO_INPUT_FLAG_MMAP_NOIRQ">
           <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
             samplingRates="48000"
@@ -192,6 +202,8 @@
         <route type="mix" sink="fast input"
           sources="Built-In Mic,Built-In Back Mic" />
         <route type="mix" sink="hotword input" sources="Built-In Mic" />
+        <route type="mix" sink="hotword tap" sources="Built-In Mic" />
+        <route type="mix" sink="hotword lookback" sources="Built-In Mic" />
       </routes>
     </module>
   </modules>
diff --git a/audio/husky/aidl_config/mixer_paths_aidl.xml b/audio/husky/aidl_config/mixer_paths_aidl.xml
index 260cda6..8b2b0e4 100644
--- a/audio/husky/aidl_config/mixer_paths_aidl.xml
+++ b/audio/husky/aidl_config/mixer_paths_aidl.xml
@@ -256,6 +256,7 @@
   <ctl name="Voice Call Mic Source" value="Builtin_MIC" />
   <ctl name="Mic Spatial Module Enable" value="0" />
   <ctl name="Audio Capture Eraser Enable" value="0" />
+  <ctl name="Hotword Tap Enable" value="0" />
 
   <!-- audio PDM mic default state -->
   <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="-1" />
@@ -378,7 +379,7 @@
   </path>
 
   <path name="raw-playback -> speaker">
-    <ctl name="TDM_0_RX Mixer RAW" value="1"/>
+    <ctl name="TDM_0_RX Mixer RAW" value="1" />
   </path>
 
   <path name="raw-playback-0 -> speaker">
@@ -425,15 +426,13 @@
     <ctl name="USB_RX Mixer EP6" value="1" />
   </path>
 
-  <path name="deep-buffer-playbackP hearing-aid"></path>
-
   <path name="compress-offload-playback">
     <ctl name="LVM Enable" value="1" />
   </path>
 
   <path name="compress-offload-playback -> speaker">
     <path name="compress-offload-playback" />
-    <ctl name="TDM_0_RX Mixer EP7" value="1"/>
+    <ctl name="TDM_0_RX Mixer EP7" value="1" />
   </path>
 
   <path name="compress-offload-playback-0 -> speaker">
@@ -457,7 +456,7 @@
   </path>
 
   <path name="mmap-playback -> speaker">
-    <ctl name="TDM_0_RX Mixer EP1" value="1"/>
+    <ctl name="TDM_0_RX Mixer EP1" value="1" />
   </path>
 
   <path name="mmap-playback-0 -> speaker">
@@ -480,15 +479,12 @@
     <ctl name="USB_RX Mixer EP1" value="1" />
   </path>
 
-  <path name="hifi-playback -> speaker">
-  </path>
-
   <path name="hifi-playback -> usb-headset">
-    <ctl name="USB_RX Mixer HIFI" value="1"/>
+    <ctl name="USB_RX Mixer HIFI" value="1" />
   </path>
 
   <path name="voip-playback -> speaker">
-    <ctl name="TDM_0_RX Mixer VOIP" value="1"/>
+    <ctl name="TDM_0_RX Mixer VOIP" value="1" />
   </path>
 
   <path name="voip-playback-0 -> speaker">
@@ -512,7 +508,7 @@
   </path>
 
   <path name="immersive-playback -> speaker">
-    <ctl name="TDM_0_RX Mixer IMSV" value="1"/>
+    <ctl name="TDM_0_RX Mixer IMSV" value="1" />
   </path>
 
   <path name="immersive-playback-0 -> speaker">
@@ -536,8 +532,8 @@
   </path>
 
   <path name="haptic-playback -> speaker">
-    <ctl name="TDM_0_RX Mixer EP3" value="1"/>
-    <ctl name="TDM_0_RX Mixer EP8" value="1"/>
+    <ctl name="TDM_0_RX Mixer EP3" value="1" />
+    <ctl name="TDM_0_RX Mixer EP8" value="1" />
   </path>
 
   <path name="haptic-playback-0 -> speaker">
@@ -553,13 +549,13 @@
   </path>
 
   <path name="haptic-playback -> bt">
-    <ctl name="BT_RX Mixer EP3" value="1"/>
-    <ctl name="TDM_0_RX Mixer EP8" value="1"/>
+    <ctl name="BT_RX Mixer EP3" value="1" />
+    <ctl name="TDM_0_RX Mixer EP8" value="1" />
   </path>
 
   <path name="haptic-playback -> usb-headset">
-    <ctl name="USB_RX Mixer EP3" value="1"/>
-    <ctl name="TDM_0_RX Mixer EP8" value="1"/>
+    <ctl name="USB_RX Mixer EP3" value="1" />
+    <ctl name="TDM_0_RX Mixer EP8" value="1" />
   </path>
 
   <!-- audio capture dynamic route -->
@@ -571,6 +567,10 @@
     <ctl name="EP1 TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
 
+  <path name="usb-headset-mic -> primary-capture-0">
+    <ctl name="EP1 TX Mixer USB_TX" value="1" />
+  </path>
+
   <path name="microphones -> voip-capture-0">
     <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
@@ -579,6 +579,14 @@
     <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
 
+  <path name="usb-headset-mic -> voip-capture-0">
+    <ctl name="VOIP TX Mixer USB_TX" value="1" />
+  </path>
+
+  <path name="bt-mic -> voip-capture-0">
+    <ctl name="VOIP TX Mixer BT_TX" value="1" />
+  </path>
+
   <path name="microphones -> fast-capture-0">
     <ctl name="EP3 TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
@@ -587,23 +595,21 @@
     <ctl name="EP3 TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
 
+  <path name="usb-headset-mic -> fast-capture-0">
+    <ctl name="EP3 TX Mixer USB_TX" value="1" />
+  </path>
+
+  <path name="bt-mic -> fast-capture-0">
+    <ctl name="EP3 TX Mixer BT_TX" value="1" />
+  </path>
+
   <path name="microphones -> sound-trigger-capture-0">
   </path>
 
-  <path name="audio-recordC usb-headset-mic">
-    <ctl name="EP1 TX Mixer USB_TX" value="1" />
+  <path name="microphones -> sound-trigger-tap-capture-0">
   </path>
 
-  <path name="voip-recordC">
-    <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
-  </path>
-
-  <path name="voip-recordC usb-headset-mic">
-    <ctl name="VOIP TX Mixer USB_TX" value="1" />
-  </path>
-
-  <path name="voip-recordC bt-mic">
-    <ctl name="VOIP TX Mixer BT_TX" value="1" />
+  <path name="microphones -> hotword-lookback-capture-0">
   </path>
 
   <!-- voice-call dynamic route -->
@@ -615,53 +621,35 @@
     <ctl name="TDM_0_RX Mixer EP5" value="1" />
   </path>
 
-  <path name="speaker-microphones -> voice-call-uplink-0">
-    <ctl name="EP4 TX Mixer INTERNAL_MIC_TX" value="1" />
-  </path>
-
-  <path name="speaker-earpiece-microphones -> voice-call-uplink-0">
-    <ctl name="EP4 TX Mixer INTERNAL_MIC_TX" value="1" />
-  </path>
-
-
-
-  <path name="voice-callP">
-    <ctl name="TDM_0_RX Mixer EP5" value="1" />
-  </path>
-
-  <path name="voice-callP bt">
+  <path name="voice-call-downlink-0 -> bt">
     <ctl name="BT_RX Mixer EP5" value="1" />
   </path>
 
-  <path name="voice-callP usb-headphone">
+  <path name="voice-call-downlink-0 -> usb-headphone">
     <ctl name="USB_RX Mixer EP5" value="1" />
   </path>
 
-  <path name="voice-callP hearing-aid">
+  <path name="voice-call-downlink-0 -> null-sink">
     <ctl name="INCALL_RX Mixer EP5" value="1" />
   </path>
 
-  <path name="voice-callP call-screen">
-    <ctl name="INCALL_RX Mixer EP5" value="1" />
-  </path>
-
-  <path name="voice-callC">
+  <path name="microphones -> voice-call-uplink-0">
     <ctl name="EP4 TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
 
-  <path name="voice-callC usb-headset-mic">
+  <path name="back-microphones -> voice-call-uplink-0">
+    <ctl name="EP4 TX Mixer INTERNAL_MIC_TX" value="1" />
+  </path>
+
+  <path name="usb-headset-mic -> voice-call-uplink-0">
     <ctl name="EP4 TX Mixer USB_TX" value="1" />
   </path>
 
-  <path name="voice-callC bt-mic">
+  <path name="bt-mic -> voice-call-uplink-0">
     <ctl name="EP4 TX Mixer BT_TX" value="1" />
   </path>
 
-  <path name="voice-callC hearing-aid">
-    <ctl name="EP4 TX Mixer INCALL_TX" value="1" />
-  </path>
-
-  <path name="voice-callC call-screen">
+  <path name="null-source -> voice-call-uplink-0">
     <ctl name="EP4 TX Mixer INCALL_TX" value="1" />
   </path>
 
@@ -669,55 +657,19 @@
     <ctl name="NoHost1 TX Mixer TDM_0_TX" value="1" />
   </path>
 
-  <path name="telephony-rx-captureC">
-    <ctl name="Incall Capture Stream0" value="DL" />
-  </path>
+  <path name="telephony-rx -> in-call-capture-0" />
+  <path name="telephony-rx -> in-call-capture-1" />
+  <path name="telephony-rx -> in-call-capture-2" />
 
-  <path name="incall-capture1C uplink">
-    <ctl name="Incall Capture Stream1" value="UL" />
-  </path>
-
-  <path name="incall-capture1C downlink">
-    <ctl name="Incall Capture Stream1" value="DL" />
-  </path>
-
-  <path name="incall-capture1C call">
-    <ctl name="Incall Capture Stream1" value="UL_DL" />
-  </path>
-
-  <path name="incall-capture2C uplink">
-    <ctl name="Incall Capture Stream2" value="UL" />
-  </path>
-
-  <path name="incall-capture2C downlink">
-    <ctl name="Incall Capture Stream2" value="DL" />
-  </path>
-
-  <path name="incall-capture2C call">
-    <ctl name="Incall Capture Stream2" value="UL_DL" />
-  </path>
-
-  <path name="low-latency-recordC">
-    <ctl name="EP3 TX Mixer INTERNAL_MIC_TX" value="1" />
-  </path>
-
-  <path name="low-latency-recordC usb-headset-mic">
-    <ctl name="EP3 TX Mixer USB_TX" value="1" />
-  </path>
-
-  <path name="low-latency-recordC bt-mic">
-    <ctl name="EP3 TX Mixer BT_TX" value="1" />
-  </path>
-
-  <path name="mmap-recordC">
+  <path name="microphones -> mmap-capture-0">
     <ctl name="EP2 TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
 
-  <path name="mmap-recordC usb-headset-mic">
+  <path name="usb-headset-mic -> mmap-capture-0">
     <ctl name="EP2 TX Mixer USB_TX" value="1" />
   </path>
 
-  <path name="mmap-recordC bt-mic">
+  <path name="bt-mic -> mmap-capture-0">
     <ctl name="EP2 TX Mixer BT_TX" value="1" />
   </path>
 
@@ -736,12 +688,6 @@
     <ctl name="Main AMP Enable Switch" value="1" />
   </path>
 
-  <path name="voice-hac">
-    <path name="voice-handset" />
-  </path>
-
-  <path name="voice-hac-handset"></path>
-
   <path name="speaker">
     <ctl name="Boost Peak Current Limit" value="2.50A" />
     <ctl name="R Boost Peak Current Limit" value="2.50A" />
@@ -758,12 +704,9 @@
     <ctl name="Boost Peak Current Limit" value="3.50A" />
     <ctl name="ASPTX1 Slot Position" value="1" />
     <ctl name="R ASPTX1 Slot Position" value="0" />
-    <!--<ctl name="R DSP RX2 Source" value="ASPRX2"/>-->
+    <!--<ctl name="R DSP RX2 Source" value="ASPRX2" />-->
     <ctl name="R Main AMP Enable Switch" value="1" />
     <ctl name="Main AMP Enable Switch" value="1" />
-  </path>
-
-  <path name="voice-speaker-post">
     <!-- load Enable FIR -->
     <ctl name="Fast Use Case Delta File" value="fast_switch1.txt" />
     <ctl name="Fast Use Case Switch Enable" value="1" />
@@ -772,76 +715,15 @@
     <ctl name="Digital PCM Volume" value="800" />
   </path>
 
-  <path name="voice-dual-speaker">
-    <!-- Speaker Separation -->
-    <path name="voice-speaker" />
-    <path name="voice-speaker-post" />
-  </path>
-
   <path name="speaker-safe">
     <ctl name="R Boost Peak Current Limit" value="3.50A" />
     <ctl name="R Main AMP Enable Switch" value="1" />
-  </path>
-
-  <path name="speaker-safe-post">
     <!-- load Bypass FIR -->
     <ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" />
     <ctl name="R Fast Use Case Switch Enable" value="1" />
   </path>
 
-  <path name="usb-tty-full"></path>
-
-  <path name="usb-tty-hco"></path>
-
-  <path name="usb-tty-vco"></path>
-
   <!-- Tx device -->
-  <path name="voice-handset-mic">
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3"/>
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
-    <ctl name="MIC DC Blocker" value="1"/>
-    <ctl name="MIC HW Gain At High Power Mode (cB)" value="130"/>
-  </path>
-
-  <path name="voice-handset-mic-post">
-    <ctl name="MIC Record Soft Gain (dB)" value="0"/>
-  </path>
-
-  <path name="microphones (VOICE)">
-    <path name="voice-handset-mic" />
-    <path name="voice-handset-mic-post" />
-  </path>
-
-  <path name="speaker-earpiece-microphones">
-    <path name="voice-handset-mic" />
-    <path name="voice-handset-mic-post" />
-  </path>
-
-  <path name="voice-speaker-mic">
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3"/>
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
-    <ctl name="MIC DC Blocker" value="1"/>
-    <ctl name="MIC HW Gain At High Power Mode (cB)" value="130"/>
-  </path>
-
-  <path name="voice-speaker-mic-post">
-    <ctl name="MIC Record Soft Gain (dB)" value="0" />
-  </path>
-
-  <path name="back-microphones (VOICE)">
-    <path name="voice-speaker-mic" />
-    <path name="voice-speaker-mic-post" />
-  </path>
-
-  <path name="speaker-microphones">
-    <path name="voice-speaker-mic" />
-    <path name="voice-speaker-mic-post" />
-  </path>
-
   <path name="microphones">
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
@@ -851,16 +733,50 @@
     <ctl name="MIC Record Soft Gain (dB)" value="22" />
   </path>
 
-  <path name="back-microphones">
-    <ctl name="Mic Spatial Module Enable" value="1"/>
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3"/>
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
-    <ctl name="MIC DC Blocker" value="1"/>
-    <ctl name="MIC Record Soft Gain (dB)" value="22"/>
+  <path name="microphones (VOICE)">
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+    <ctl name="MIC DC Blocker" value="1" />
+    <ctl name="MIC HW Gain At High Power Mode (cB)" value="130" />
+    <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
+  <path name="microphones (VOICE_RECOGNITION)">
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+    <ctl name="MIC DC Blocker" value="1" />
+    <ctl name="MIC Record Soft Gain (dB)" value="22" />
+  </path>
+
+  <path name="microphones (VOICE_RECOGNITION,SOUND_TRIGGER_TAP)">
+    <ctl name="Audio Capture Eraser Enable" value="1" />
+    <ctl name="Hotword Tap Enable" value="1" />
+    <ctl name="MIC Record Soft Gain (dB)" value="0" />
+  </path>
+
+  <path name="back-microphones">
+    <ctl name="Mic Spatial Module Enable" value="1" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+    <ctl name="MIC DC Blocker" value="1" />
+    <ctl name="MIC Record Soft Gain (dB)" value="22" />
+  </path>
+
+  <path name="back-microphones (VOICE)">
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+    <ctl name="MIC DC Blocker" value="1" />
+    <ctl name="MIC HW Gain At High Power Mode (cB)" value="130" />
+    <ctl name="MIC Record Soft Gain (dB)" value="0" />
+  </path>
 
   <path name="camcorder-mic">
     <ctl name="Mic Spatial Module Enable" value="1" />
@@ -869,24 +785,9 @@
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
     <ctl name="MIC DC Blocker" value="1" />
-  </path>
-
-  <path name="camcorder-mic-post">
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
-  <path name="voice-recog-mic">
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
-    <ctl name="MIC DC Blocker" value="1" />
-  </path>
-
-  <path name="voice-recog-mic-post">
-    <ctl name="MIC Record Soft Gain (dB)" value="22" />
-  </path>
-
   <path name="voice-recog-aec-mic">
     <ctl name="Audio Capture Eraser Enable" value="1" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
@@ -895,9 +796,6 @@
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
     <ctl name="MIC DC Blocker" value="1" />
     <ctl name="Audio Capture Mic Source" value="ERASER" />
-  </path>
-
-  <path name="voice-recog-aec-mic-post">
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
@@ -907,9 +805,6 @@
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
     <ctl name="MIC DC Blocker" value="1" />
-  </path>
-
-  <path name="unprocessed-mic-post">
     <ctl name="MIC Record Soft Gain (dB)" value="5" />
   </path>
 
@@ -919,9 +814,6 @@
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
     <ctl name="MIC DC Blocker" value="1" />
-  </path>
-
-  <path name="unprocessed-dual-mic-post">
     <ctl name="MIC Record Soft Gain (dB)" value="5" />
   </path>
 
@@ -931,9 +823,6 @@
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
     <ctl name="MIC DC Blocker" value="1" />
-  </path>
-
-  <path name="unprocessed-triple-mic-post">
     <ctl name="MIC Record Soft Gain (dB)" value="5" />
   </path>
 
@@ -944,9 +833,6 @@
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
     <ctl name="Audio Capture Mic Source" value="BT_MIC" />
     <ctl name="Voice Call Mic Source" value="BT_MIC" />
-  </path>
-
-  <path name="bt-mic-post">
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
@@ -957,9 +843,6 @@
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
     <ctl name="Audio Capture Mic Source" value="USB_MIC" />
     <ctl name="Voice Call Mic Source" value="USB_MIC" />
-  </path>
-
-  <path name="usb-headset-mic-post">
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
diff --git a/audio/shiba/aidl_config/audio_policy_configuration.xml b/audio/shiba/aidl_config/audio_policy_configuration.xml
index dfc8577..c93d1cb 100644
--- a/audio/shiba/aidl_config/audio_policy_configuration.xml
+++ b/audio/shiba/aidl_config/audio_policy_configuration.xml
@@ -104,6 +104,16 @@
             samplingRates="16000"
             channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO" />
         </mixPort>
+        <mixPort name="hotword tap" role="sink" flags="AUDIO_INPUT_FLAG_HOTWORD_TAP">
+          <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+            samplingRates="16000"
+            channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO" />
+        </mixPort>
+        <mixPort name="hotword lookback" role="sink" flags="AUDIO_INPUT_FLAG_HOTWORD_TAP AUDIO_INPUT_FLAG_HW_LOOKBACK">
+          <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+            samplingRates="16000"
+            channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO" />
+        </mixPort>
         <!-- <mixPort name="mmap capture" role="sink" flags="AUDIO_INPUT_FLAG_MMAP_NOIRQ">
           <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
             samplingRates="48000"
@@ -192,6 +202,8 @@
         <route type="mix" sink="fast input"
           sources="Built-In Mic,Built-In Back Mic" />
         <route type="mix" sink="hotword input" sources="Built-In Mic" />
+        <route type="mix" sink="hotword tap" sources="Built-In Mic" />
+        <route type="mix" sink="hotword lookback" sources="Built-In Mic" />
       </routes>
     </module>
   </modules>
diff --git a/audio/shiba/aidl_config/mixer_paths_aidl.xml b/audio/shiba/aidl_config/mixer_paths_aidl.xml
index 260cda6..8b2b0e4 100644
--- a/audio/shiba/aidl_config/mixer_paths_aidl.xml
+++ b/audio/shiba/aidl_config/mixer_paths_aidl.xml
@@ -256,6 +256,7 @@
   <ctl name="Voice Call Mic Source" value="Builtin_MIC" />
   <ctl name="Mic Spatial Module Enable" value="0" />
   <ctl name="Audio Capture Eraser Enable" value="0" />
+  <ctl name="Hotword Tap Enable" value="0" />
 
   <!-- audio PDM mic default state -->
   <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="-1" />
@@ -378,7 +379,7 @@
   </path>
 
   <path name="raw-playback -> speaker">
-    <ctl name="TDM_0_RX Mixer RAW" value="1"/>
+    <ctl name="TDM_0_RX Mixer RAW" value="1" />
   </path>
 
   <path name="raw-playback-0 -> speaker">
@@ -425,15 +426,13 @@
     <ctl name="USB_RX Mixer EP6" value="1" />
   </path>
 
-  <path name="deep-buffer-playbackP hearing-aid"></path>
-
   <path name="compress-offload-playback">
     <ctl name="LVM Enable" value="1" />
   </path>
 
   <path name="compress-offload-playback -> speaker">
     <path name="compress-offload-playback" />
-    <ctl name="TDM_0_RX Mixer EP7" value="1"/>
+    <ctl name="TDM_0_RX Mixer EP7" value="1" />
   </path>
 
   <path name="compress-offload-playback-0 -> speaker">
@@ -457,7 +456,7 @@
   </path>
 
   <path name="mmap-playback -> speaker">
-    <ctl name="TDM_0_RX Mixer EP1" value="1"/>
+    <ctl name="TDM_0_RX Mixer EP1" value="1" />
   </path>
 
   <path name="mmap-playback-0 -> speaker">
@@ -480,15 +479,12 @@
     <ctl name="USB_RX Mixer EP1" value="1" />
   </path>
 
-  <path name="hifi-playback -> speaker">
-  </path>
-
   <path name="hifi-playback -> usb-headset">
-    <ctl name="USB_RX Mixer HIFI" value="1"/>
+    <ctl name="USB_RX Mixer HIFI" value="1" />
   </path>
 
   <path name="voip-playback -> speaker">
-    <ctl name="TDM_0_RX Mixer VOIP" value="1"/>
+    <ctl name="TDM_0_RX Mixer VOIP" value="1" />
   </path>
 
   <path name="voip-playback-0 -> speaker">
@@ -512,7 +508,7 @@
   </path>
 
   <path name="immersive-playback -> speaker">
-    <ctl name="TDM_0_RX Mixer IMSV" value="1"/>
+    <ctl name="TDM_0_RX Mixer IMSV" value="1" />
   </path>
 
   <path name="immersive-playback-0 -> speaker">
@@ -536,8 +532,8 @@
   </path>
 
   <path name="haptic-playback -> speaker">
-    <ctl name="TDM_0_RX Mixer EP3" value="1"/>
-    <ctl name="TDM_0_RX Mixer EP8" value="1"/>
+    <ctl name="TDM_0_RX Mixer EP3" value="1" />
+    <ctl name="TDM_0_RX Mixer EP8" value="1" />
   </path>
 
   <path name="haptic-playback-0 -> speaker">
@@ -553,13 +549,13 @@
   </path>
 
   <path name="haptic-playback -> bt">
-    <ctl name="BT_RX Mixer EP3" value="1"/>
-    <ctl name="TDM_0_RX Mixer EP8" value="1"/>
+    <ctl name="BT_RX Mixer EP3" value="1" />
+    <ctl name="TDM_0_RX Mixer EP8" value="1" />
   </path>
 
   <path name="haptic-playback -> usb-headset">
-    <ctl name="USB_RX Mixer EP3" value="1"/>
-    <ctl name="TDM_0_RX Mixer EP8" value="1"/>
+    <ctl name="USB_RX Mixer EP3" value="1" />
+    <ctl name="TDM_0_RX Mixer EP8" value="1" />
   </path>
 
   <!-- audio capture dynamic route -->
@@ -571,6 +567,10 @@
     <ctl name="EP1 TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
 
+  <path name="usb-headset-mic -> primary-capture-0">
+    <ctl name="EP1 TX Mixer USB_TX" value="1" />
+  </path>
+
   <path name="microphones -> voip-capture-0">
     <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
@@ -579,6 +579,14 @@
     <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
 
+  <path name="usb-headset-mic -> voip-capture-0">
+    <ctl name="VOIP TX Mixer USB_TX" value="1" />
+  </path>
+
+  <path name="bt-mic -> voip-capture-0">
+    <ctl name="VOIP TX Mixer BT_TX" value="1" />
+  </path>
+
   <path name="microphones -> fast-capture-0">
     <ctl name="EP3 TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
@@ -587,23 +595,21 @@
     <ctl name="EP3 TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
 
+  <path name="usb-headset-mic -> fast-capture-0">
+    <ctl name="EP3 TX Mixer USB_TX" value="1" />
+  </path>
+
+  <path name="bt-mic -> fast-capture-0">
+    <ctl name="EP3 TX Mixer BT_TX" value="1" />
+  </path>
+
   <path name="microphones -> sound-trigger-capture-0">
   </path>
 
-  <path name="audio-recordC usb-headset-mic">
-    <ctl name="EP1 TX Mixer USB_TX" value="1" />
+  <path name="microphones -> sound-trigger-tap-capture-0">
   </path>
 
-  <path name="voip-recordC">
-    <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
-  </path>
-
-  <path name="voip-recordC usb-headset-mic">
-    <ctl name="VOIP TX Mixer USB_TX" value="1" />
-  </path>
-
-  <path name="voip-recordC bt-mic">
-    <ctl name="VOIP TX Mixer BT_TX" value="1" />
+  <path name="microphones -> hotword-lookback-capture-0">
   </path>
 
   <!-- voice-call dynamic route -->
@@ -615,53 +621,35 @@
     <ctl name="TDM_0_RX Mixer EP5" value="1" />
   </path>
 
-  <path name="speaker-microphones -> voice-call-uplink-0">
-    <ctl name="EP4 TX Mixer INTERNAL_MIC_TX" value="1" />
-  </path>
-
-  <path name="speaker-earpiece-microphones -> voice-call-uplink-0">
-    <ctl name="EP4 TX Mixer INTERNAL_MIC_TX" value="1" />
-  </path>
-
-
-
-  <path name="voice-callP">
-    <ctl name="TDM_0_RX Mixer EP5" value="1" />
-  </path>
-
-  <path name="voice-callP bt">
+  <path name="voice-call-downlink-0 -> bt">
     <ctl name="BT_RX Mixer EP5" value="1" />
   </path>
 
-  <path name="voice-callP usb-headphone">
+  <path name="voice-call-downlink-0 -> usb-headphone">
     <ctl name="USB_RX Mixer EP5" value="1" />
   </path>
 
-  <path name="voice-callP hearing-aid">
+  <path name="voice-call-downlink-0 -> null-sink">
     <ctl name="INCALL_RX Mixer EP5" value="1" />
   </path>
 
-  <path name="voice-callP call-screen">
-    <ctl name="INCALL_RX Mixer EP5" value="1" />
-  </path>
-
-  <path name="voice-callC">
+  <path name="microphones -> voice-call-uplink-0">
     <ctl name="EP4 TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
 
-  <path name="voice-callC usb-headset-mic">
+  <path name="back-microphones -> voice-call-uplink-0">
+    <ctl name="EP4 TX Mixer INTERNAL_MIC_TX" value="1" />
+  </path>
+
+  <path name="usb-headset-mic -> voice-call-uplink-0">
     <ctl name="EP4 TX Mixer USB_TX" value="1" />
   </path>
 
-  <path name="voice-callC bt-mic">
+  <path name="bt-mic -> voice-call-uplink-0">
     <ctl name="EP4 TX Mixer BT_TX" value="1" />
   </path>
 
-  <path name="voice-callC hearing-aid">
-    <ctl name="EP4 TX Mixer INCALL_TX" value="1" />
-  </path>
-
-  <path name="voice-callC call-screen">
+  <path name="null-source -> voice-call-uplink-0">
     <ctl name="EP4 TX Mixer INCALL_TX" value="1" />
   </path>
 
@@ -669,55 +657,19 @@
     <ctl name="NoHost1 TX Mixer TDM_0_TX" value="1" />
   </path>
 
-  <path name="telephony-rx-captureC">
-    <ctl name="Incall Capture Stream0" value="DL" />
-  </path>
+  <path name="telephony-rx -> in-call-capture-0" />
+  <path name="telephony-rx -> in-call-capture-1" />
+  <path name="telephony-rx -> in-call-capture-2" />
 
-  <path name="incall-capture1C uplink">
-    <ctl name="Incall Capture Stream1" value="UL" />
-  </path>
-
-  <path name="incall-capture1C downlink">
-    <ctl name="Incall Capture Stream1" value="DL" />
-  </path>
-
-  <path name="incall-capture1C call">
-    <ctl name="Incall Capture Stream1" value="UL_DL" />
-  </path>
-
-  <path name="incall-capture2C uplink">
-    <ctl name="Incall Capture Stream2" value="UL" />
-  </path>
-
-  <path name="incall-capture2C downlink">
-    <ctl name="Incall Capture Stream2" value="DL" />
-  </path>
-
-  <path name="incall-capture2C call">
-    <ctl name="Incall Capture Stream2" value="UL_DL" />
-  </path>
-
-  <path name="low-latency-recordC">
-    <ctl name="EP3 TX Mixer INTERNAL_MIC_TX" value="1" />
-  </path>
-
-  <path name="low-latency-recordC usb-headset-mic">
-    <ctl name="EP3 TX Mixer USB_TX" value="1" />
-  </path>
-
-  <path name="low-latency-recordC bt-mic">
-    <ctl name="EP3 TX Mixer BT_TX" value="1" />
-  </path>
-
-  <path name="mmap-recordC">
+  <path name="microphones -> mmap-capture-0">
     <ctl name="EP2 TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
 
-  <path name="mmap-recordC usb-headset-mic">
+  <path name="usb-headset-mic -> mmap-capture-0">
     <ctl name="EP2 TX Mixer USB_TX" value="1" />
   </path>
 
-  <path name="mmap-recordC bt-mic">
+  <path name="bt-mic -> mmap-capture-0">
     <ctl name="EP2 TX Mixer BT_TX" value="1" />
   </path>
 
@@ -736,12 +688,6 @@
     <ctl name="Main AMP Enable Switch" value="1" />
   </path>
 
-  <path name="voice-hac">
-    <path name="voice-handset" />
-  </path>
-
-  <path name="voice-hac-handset"></path>
-
   <path name="speaker">
     <ctl name="Boost Peak Current Limit" value="2.50A" />
     <ctl name="R Boost Peak Current Limit" value="2.50A" />
@@ -758,12 +704,9 @@
     <ctl name="Boost Peak Current Limit" value="3.50A" />
     <ctl name="ASPTX1 Slot Position" value="1" />
     <ctl name="R ASPTX1 Slot Position" value="0" />
-    <!--<ctl name="R DSP RX2 Source" value="ASPRX2"/>-->
+    <!--<ctl name="R DSP RX2 Source" value="ASPRX2" />-->
     <ctl name="R Main AMP Enable Switch" value="1" />
     <ctl name="Main AMP Enable Switch" value="1" />
-  </path>
-
-  <path name="voice-speaker-post">
     <!-- load Enable FIR -->
     <ctl name="Fast Use Case Delta File" value="fast_switch1.txt" />
     <ctl name="Fast Use Case Switch Enable" value="1" />
@@ -772,76 +715,15 @@
     <ctl name="Digital PCM Volume" value="800" />
   </path>
 
-  <path name="voice-dual-speaker">
-    <!-- Speaker Separation -->
-    <path name="voice-speaker" />
-    <path name="voice-speaker-post" />
-  </path>
-
   <path name="speaker-safe">
     <ctl name="R Boost Peak Current Limit" value="3.50A" />
     <ctl name="R Main AMP Enable Switch" value="1" />
-  </path>
-
-  <path name="speaker-safe-post">
     <!-- load Bypass FIR -->
     <ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" />
     <ctl name="R Fast Use Case Switch Enable" value="1" />
   </path>
 
-  <path name="usb-tty-full"></path>
-
-  <path name="usb-tty-hco"></path>
-
-  <path name="usb-tty-vco"></path>
-
   <!-- Tx device -->
-  <path name="voice-handset-mic">
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3"/>
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
-    <ctl name="MIC DC Blocker" value="1"/>
-    <ctl name="MIC HW Gain At High Power Mode (cB)" value="130"/>
-  </path>
-
-  <path name="voice-handset-mic-post">
-    <ctl name="MIC Record Soft Gain (dB)" value="0"/>
-  </path>
-
-  <path name="microphones (VOICE)">
-    <path name="voice-handset-mic" />
-    <path name="voice-handset-mic-post" />
-  </path>
-
-  <path name="speaker-earpiece-microphones">
-    <path name="voice-handset-mic" />
-    <path name="voice-handset-mic-post" />
-  </path>
-
-  <path name="voice-speaker-mic">
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3"/>
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
-    <ctl name="MIC DC Blocker" value="1"/>
-    <ctl name="MIC HW Gain At High Power Mode (cB)" value="130"/>
-  </path>
-
-  <path name="voice-speaker-mic-post">
-    <ctl name="MIC Record Soft Gain (dB)" value="0" />
-  </path>
-
-  <path name="back-microphones (VOICE)">
-    <path name="voice-speaker-mic" />
-    <path name="voice-speaker-mic-post" />
-  </path>
-
-  <path name="speaker-microphones">
-    <path name="voice-speaker-mic" />
-    <path name="voice-speaker-mic-post" />
-  </path>
-
   <path name="microphones">
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
@@ -851,16 +733,50 @@
     <ctl name="MIC Record Soft Gain (dB)" value="22" />
   </path>
 
-  <path name="back-microphones">
-    <ctl name="Mic Spatial Module Enable" value="1"/>
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3"/>
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
-    <ctl name="MIC DC Blocker" value="1"/>
-    <ctl name="MIC Record Soft Gain (dB)" value="22"/>
+  <path name="microphones (VOICE)">
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+    <ctl name="MIC DC Blocker" value="1" />
+    <ctl name="MIC HW Gain At High Power Mode (cB)" value="130" />
+    <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
+  <path name="microphones (VOICE_RECOGNITION)">
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+    <ctl name="MIC DC Blocker" value="1" />
+    <ctl name="MIC Record Soft Gain (dB)" value="22" />
+  </path>
+
+  <path name="microphones (VOICE_RECOGNITION,SOUND_TRIGGER_TAP)">
+    <ctl name="Audio Capture Eraser Enable" value="1" />
+    <ctl name="Hotword Tap Enable" value="1" />
+    <ctl name="MIC Record Soft Gain (dB)" value="0" />
+  </path>
+
+  <path name="back-microphones">
+    <ctl name="Mic Spatial Module Enable" value="1" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+    <ctl name="MIC DC Blocker" value="1" />
+    <ctl name="MIC Record Soft Gain (dB)" value="22" />
+  </path>
+
+  <path name="back-microphones (VOICE)">
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+    <ctl name="MIC DC Blocker" value="1" />
+    <ctl name="MIC HW Gain At High Power Mode (cB)" value="130" />
+    <ctl name="MIC Record Soft Gain (dB)" value="0" />
+  </path>
 
   <path name="camcorder-mic">
     <ctl name="Mic Spatial Module Enable" value="1" />
@@ -869,24 +785,9 @@
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
     <ctl name="MIC DC Blocker" value="1" />
-  </path>
-
-  <path name="camcorder-mic-post">
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
-  <path name="voice-recog-mic">
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
-    <ctl name="MIC DC Blocker" value="1" />
-  </path>
-
-  <path name="voice-recog-mic-post">
-    <ctl name="MIC Record Soft Gain (dB)" value="22" />
-  </path>
-
   <path name="voice-recog-aec-mic">
     <ctl name="Audio Capture Eraser Enable" value="1" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
@@ -895,9 +796,6 @@
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
     <ctl name="MIC DC Blocker" value="1" />
     <ctl name="Audio Capture Mic Source" value="ERASER" />
-  </path>
-
-  <path name="voice-recog-aec-mic-post">
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
@@ -907,9 +805,6 @@
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
     <ctl name="MIC DC Blocker" value="1" />
-  </path>
-
-  <path name="unprocessed-mic-post">
     <ctl name="MIC Record Soft Gain (dB)" value="5" />
   </path>
 
@@ -919,9 +814,6 @@
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
     <ctl name="MIC DC Blocker" value="1" />
-  </path>
-
-  <path name="unprocessed-dual-mic-post">
     <ctl name="MIC Record Soft Gain (dB)" value="5" />
   </path>
 
@@ -931,9 +823,6 @@
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
     <ctl name="MIC DC Blocker" value="1" />
-  </path>
-
-  <path name="unprocessed-triple-mic-post">
     <ctl name="MIC Record Soft Gain (dB)" value="5" />
   </path>
 
@@ -944,9 +833,6 @@
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
     <ctl name="Audio Capture Mic Source" value="BT_MIC" />
     <ctl name="Voice Call Mic Source" value="BT_MIC" />
-  </path>
-
-  <path name="bt-mic-post">
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
@@ -957,9 +843,6 @@
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
     <ctl name="Audio Capture Mic Source" value="USB_MIC" />
     <ctl name="Voice Call Mic Source" value="USB_MIC" />
-  </path>
-
-  <path name="usb-headset-mic-post">
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>