Merge "caimito: add sound-trigger-microphones" into 24D1-dev am: 2b65d041cb

Original change: https://googleplex-android-review.googlesource.com/c/device/google/caimito/+/26467510

Change-Id: Id03b0a6a4f88498372c70cf5f9a4162c41ae87f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Rios Kao 2024-03-12 02:35:38 +00:00 committed by Automerger Merge Worker
commit 97721df433
3 changed files with 21 additions and 27 deletions

View file

@ -1087,11 +1087,15 @@
<ctl name="EP3 TX Mixer BT_TX" value="1" /> <ctl name="EP3 TX Mixer BT_TX" value="1" />
</path> </path>
<path name="microphones -> sound-trigger-capture-0" /> <path name="sound-trigger-microphones -> sound-trigger-capture-0" />
<path name="microphones -> sound-trigger-tap-capture-0" /> <path name="sound-trigger-microphones -> sound-trigger-tap-capture-0">
<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="microphones -> hotword-lookback-capture-0" /> <path name="sound-trigger-microphones -> hotword-lookback-capture-0" />
<path name="ultrasound-microphones -> ultrasound-capture-0"> <path name="ultrasound-microphones -> ultrasound-capture-0">
<ctl name="EP5 TX Mixer INTERNAL_MIC_US_TX" value="1" /> <ctl name="EP5 TX Mixer INTERNAL_MIC_US_TX" value="1" />
@ -1334,12 +1338,6 @@
<ctl name="MIC Record Soft Gain (dB)" value="22" /> <ctl name="MIC Record Soft Gain (dB)" value="22" />
</path> </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="microphones (SOUND_TRIGGER_AEC)"> <path name="microphones (SOUND_TRIGGER_AEC)">
<path name="builtin-mic-id-capture-list" /> <path name="builtin-mic-id-capture-list" />
<ctl name="MIC DC Blocker" value="1" /> <ctl name="MIC DC Blocker" value="1" />

View file

@ -1087,11 +1087,15 @@
<ctl name="EP3 TX Mixer BT_TX" value="1" /> <ctl name="EP3 TX Mixer BT_TX" value="1" />
</path> </path>
<path name="microphones -> sound-trigger-capture-0" /> <path name="sound-trigger-microphones -> sound-trigger-capture-0" />
<path name="microphones -> sound-trigger-tap-capture-0" /> <path name="sound-trigger-microphones -> sound-trigger-tap-capture-0">
<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="microphones -> hotword-lookback-capture-0" /> <path name="sound-trigger-microphones -> hotword-lookback-capture-0" />
<path name="ultrasound-microphones -> ultrasound-capture-0"> <path name="ultrasound-microphones -> ultrasound-capture-0">
<ctl name="EP5 TX Mixer INTERNAL_MIC_US_TX" value="1" /> <ctl name="EP5 TX Mixer INTERNAL_MIC_US_TX" value="1" />
@ -1334,12 +1338,6 @@
<ctl name="MIC Record Soft Gain (dB)" value="22" /> <ctl name="MIC Record Soft Gain (dB)" value="22" />
</path> </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="microphones (SOUND_TRIGGER_AEC)"> <path name="microphones (SOUND_TRIGGER_AEC)">
<path name="builtin-mic-id-capture-list" /> <path name="builtin-mic-id-capture-list" />
<ctl name="MIC DC Blocker" value="1" /> <ctl name="MIC DC Blocker" value="1" />

View file

@ -1087,11 +1087,15 @@
<ctl name="EP3 TX Mixer BT_TX" value="1" /> <ctl name="EP3 TX Mixer BT_TX" value="1" />
</path> </path>
<path name="microphones -> sound-trigger-capture-0" /> <path name="sound-trigger-microphones -> sound-trigger-capture-0" />
<path name="microphones -> sound-trigger-tap-capture-0" /> <path name="sound-trigger-microphones -> sound-trigger-tap-capture-0">
<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="microphones -> hotword-lookback-capture-0" /> <path name="sound-trigger-microphones -> hotword-lookback-capture-0" />
<path name="ultrasound-microphones -> ultrasound-capture-0"> <path name="ultrasound-microphones -> ultrasound-capture-0">
<ctl name="EP5 TX Mixer INTERNAL_MIC_US_TX" value="1" /> <ctl name="EP5 TX Mixer INTERNAL_MIC_US_TX" value="1" />
@ -1334,12 +1338,6 @@
<ctl name="MIC Record Soft Gain (dB)" value="22" /> <ctl name="MIC Record Soft Gain (dB)" value="22" />
</path> </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="microphones (SOUND_TRIGGER_AEC)"> <path name="microphones (SOUND_TRIGGER_AEC)">
<path name="builtin-mic-id-capture-list" /> <path name="builtin-mic-id-capture-list" />
<ctl name="MIC DC Blocker" value="1" /> <ctl name="MIC DC Blocker" value="1" />