commit e298122882eb868a2a956b762833979b55233528
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Oct 15 01:00:57 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Oct 15 01:00:57 2021 +0000
tree c8f0e97278d0fdfe3d6491afaf8d29aec022d68c
parent 5555251ed61dda456a032eb910b216201c397ffe
parent 2c35c05408c08bf150377aca3621e086b402bbef

Snap for 7825665 from 9ffad2b4bb6b9c95c26a54c067f20125234398b6 to sc-qpr1-d-release

Change-Id: I04083222b64b9fe789ddb0cdd85532409cb07074

audio/oriole/config/mixer_paths.xml

diff --git a/audio/oriole/config/mixer_paths.xml b/audio/oriole/config/mixer_paths.xml
index 4080c14..55d5252 100644
--- a/audio/oriole/config/mixer_paths.xml
+++ b/audio/oriole/config/mixer_paths.xml
@@ -231,6 +231,7 @@
     <ctl name="AoC Modem Downlink ASRC Mode" value="ASP_ON"/>
     <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"/>
 
     <!-- audio PDM mic default state -->
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="-1"/>
@@ -711,6 +712,20 @@
         <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"/>
+        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="1"/>
+        <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="Audio Capture Mic Source" value="ERASER"/>
+    </path>
+
+    <path name="voice-recog-aec-mic-post">
+        <ctl name="MIC Record Soft Gain (dB)" value="0"/>
+    </path>
+
     <path name="unprocessed-mic">
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="1"/>

audio/raven/config/mixer_paths.xml

diff --git a/audio/raven/config/mixer_paths.xml b/audio/raven/config/mixer_paths.xml
index 4080c14..55d5252 100644
--- a/audio/raven/config/mixer_paths.xml
+++ b/audio/raven/config/mixer_paths.xml
@@ -231,6 +231,7 @@
     <ctl name="AoC Modem Downlink ASRC Mode" value="ASP_ON"/>
     <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"/>
 
     <!-- audio PDM mic default state -->
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="-1"/>
@@ -711,6 +712,20 @@
         <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"/>
+        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="1"/>
+        <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="Audio Capture Mic Source" value="ERASER"/>
+    </path>
+
+    <path name="voice-recog-aec-mic-post">
+        <ctl name="MIC Record Soft Gain (dB)" value="0"/>
+    </path>
+
     <path name="unprocessed-mic">
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="1"/>

thermal_info_config_raven.json

diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json
index b4b899a..c01ece3 100644
--- a/thermal_info_config_raven.json
+++ b/thermal_info_config_raven.json
@@ -435,7 +435,7 @@
                     "LimitInfo": [0, 1, 2, 3, 4, 4, 4],
                     "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
                     "PowerThreshold": [500, 500, 500, 500, 500, 0, 0],
-                    "CdevFloorWithPowerLink": [0, 1, 2, 3, 4, 4, 4],
+                    "CdevFloorWithPowerLink": [0, 1, 2, 3, 3, 4, 4],
                     "ReleaseLogic": "RELEASE_TO_FLOOR",
                     "ThrottlingWithPowerLink":true
                 },