[automerger skipped] [DO NOT MERGE] Jump SVN to 7 for VZW EMR am: 2bc9d4dab1 -s ours
am skip reason: skipped by user robinpeng
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/16128024
Change-Id: I3e61e4a1d1bd8de38b024356ea8433bcafaf495a
diff --git a/audio/oriole/config/audio_policy_volumes.xml b/audio/oriole/config/audio_policy_volumes.xml
index a58e237..1c46cd9 100644
--- a/audio/oriole/config/audio_policy_volumes.xml
+++ b/audio/oriole/config/audio_policy_volumes.xml
@@ -90,7 +90,7 @@
<volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEADSET"
ref="DEFAULT_NON_MUTABLE_HEADSET_VOLUME_CURVE"/>
<volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
- <point>1,-3600</point>
+ <point>0,-4800</point>
<point>33,-2400</point>
<point>66,-1200</point>
<point>100,0</point>
diff --git a/audio/oriole/config/mixer_paths.xml b/audio/oriole/config/mixer_paths.xml
index 6a9b434..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"/>
@@ -528,7 +529,6 @@
</path>
<path name="voice-callC usb-headset-mic">
- <ctl name="AoC Modem Downlink ASRC Mode" value="ASP_OFF"/>
<ctl name="EP4 TX Mixer USB_TX" value="1"/>
</path>
@@ -712,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"/>
diff --git a/audio/oriole/cs35l41/fw/cs35l41-dsp1-spk-prot.bin b/audio/oriole/cs35l41/fw/cs35l41-dsp1-spk-prot.bin
index b349ba3..846eca2 100644
--- a/audio/oriole/cs35l41/fw/cs35l41-dsp1-spk-prot.bin
+++ b/audio/oriole/cs35l41/fw/cs35l41-dsp1-spk-prot.bin
Binary files differ
diff --git a/audio/oriole/tuning/bluenote/recording.gatf b/audio/oriole/tuning/bluenote/recording.gatf
index b7c56da..2667f0c 100644
--- a/audio/oriole/tuning/bluenote/recording.gatf
+++ b/audio/oriole/tuning/bluenote/recording.gatf
Binary files differ
diff --git a/audio/oriole/tuning/bluenote/template.xml b/audio/oriole/tuning/bluenote/template.xml
index 244ebe8..c27188e 100644
--- a/audio/oriole/tuning/bluenote/template.xml
+++ b/audio/oriole/tuning/bluenote/template.xml
@@ -234,6 +234,8 @@
<param name="attackTime_ms" size="4" type="float"/>
<param name="releaseTime_ms" size="4" type="float"/>
<param name="hysteresis" size="4" type="float"/>
+ <param default="0" max="1" min="0" name="rms_manual_enable" type="uint32"/>
+ <param default="0" max="2" min="0" name="rms_channel" type="uint32"/>
</struct>
<struct id="17">
<param max="30" min="-30" name="limiter_gain_dB" type="float"/>
diff --git a/audio/raven/config/audio_policy_volumes.xml b/audio/raven/config/audio_policy_volumes.xml
index eae4c9a..c81014e 100644
--- a/audio/raven/config/audio_policy_volumes.xml
+++ b/audio/raven/config/audio_policy_volumes.xml
@@ -94,7 +94,7 @@
<volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEADSET"
ref="DEFAULT_NON_MUTABLE_HEADSET_VOLUME_CURVE"/>
<volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
- <point>1,-3600</point>
+ <point>0,-5200</point>
<point>33,-2400</point>
<point>66,-1200</point>
<point>100,0</point>
diff --git a/audio/raven/config/mixer_paths.xml b/audio/raven/config/mixer_paths.xml
index 6a9b434..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"/>
@@ -528,7 +529,6 @@
</path>
<path name="voice-callC usb-headset-mic">
- <ctl name="AoC Modem Downlink ASRC Mode" value="ASP_OFF"/>
<ctl name="EP4 TX Mixer USB_TX" value="1"/>
</path>
@@ -712,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"/>
diff --git a/audio/raven/tuning/bluenote/recording.gatf b/audio/raven/tuning/bluenote/recording.gatf
index b76c8ba..dba7c69 100644
--- a/audio/raven/tuning/bluenote/recording.gatf
+++ b/audio/raven/tuning/bluenote/recording.gatf
Binary files differ
diff --git a/audio/raven/tuning/bluenote/template.xml b/audio/raven/tuning/bluenote/template.xml
index 244ebe8..c27188e 100644
--- a/audio/raven/tuning/bluenote/template.xml
+++ b/audio/raven/tuning/bluenote/template.xml
@@ -234,6 +234,8 @@
<param name="attackTime_ms" size="4" type="float"/>
<param name="releaseTime_ms" size="4" type="float"/>
<param name="hysteresis" size="4" type="float"/>
+ <param default="0" max="1" min="0" name="rms_manual_enable" type="uint32"/>
+ <param default="0" max="2" min="0" name="rms_channel" type="uint32"/>
</struct>
<struct id="17">
<param max="30" min="-30" name="limiter_gain_dB" type="float"/>
diff --git a/audio/slider/config/mixer_paths.xml b/audio/slider/config/mixer_paths.xml
index 467a1ff..9b9568b 100644
--- a/audio/slider/config/mixer_paths.xml
+++ b/audio/slider/config/mixer_paths.xml
@@ -537,7 +537,6 @@
</path>
<path name="voice-callC usb-headset-mic">
- <ctl name="AoC Modem Downlink ASRC Mode" value="ASP_OFF"/>
<ctl name="EP4 TX Mixer USB_TX" value="1"/>
</path>
diff --git a/audio/whitefin/config/mixer_paths.xml b/audio/whitefin/config/mixer_paths.xml
index 9b297ff..7016b41 100644
--- a/audio/whitefin/config/mixer_paths.xml
+++ b/audio/whitefin/config/mixer_paths.xml
@@ -639,7 +639,6 @@
</path>
<path name="voice-callC usb-headset-mic">
- <ctl name="AoC Modem Downlink ASRC Mode" value="ASP_OFF"/>
<ctl name="EP4 TX Mixer USB_TX" value="1"/>
</path>
diff --git a/device-oriole.mk b/device-oriole.mk
index 74019d2..a3744be 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -14,7 +14,8 @@
# limitations under the License.
#
-TARGET_KERNEL_DIR := device/google/raviole-kernel
+TARGET_KERNEL_DIR ?= device/google/raviole-kernel
+TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers
$(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-oriole.mk)
$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
@@ -143,7 +144,7 @@
# Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \
- ro.vendor.build.svn=7
+ ro.vendor.build.svn=8
# Hide cutout overlays
PRODUCT_PACKAGES += \
diff --git a/device-raven.mk b/device-raven.mk
index 7f79ff8..723844c 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -14,7 +14,8 @@
# limitations under the License.
#
-TARGET_KERNEL_DIR := device/google/raviole-kernel
+TARGET_KERNEL_DIR ?= device/google/raviole-kernel
+TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers
$(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-raven.mk)
$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
@@ -144,7 +145,7 @@
# Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \
- ro.vendor.build.svn=7
+ ro.vendor.build.svn=8
# Hide cutout overlays
PRODUCT_PACKAGES += \
diff --git a/device-slider.mk b/device-slider.mk
index f4e6b57..8acb9ff 100644
--- a/device-slider.mk
+++ b/device-slider.mk
@@ -14,7 +14,8 @@
# limitations under the License.
#
-TARGET_KERNEL_DIR := device/google/raviole-kernel
+TARGET_KERNEL_DIR ?= device/google/raviole-kernel
+TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers
$(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-slider.mk)
$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
diff --git a/device-whitefin.mk b/device-whitefin.mk
index 17e4d45..a61250b 100644
--- a/device-whitefin.mk
+++ b/device-whitefin.mk
@@ -14,7 +14,8 @@
# limitations under the License.
#
-TARGET_KERNEL_DIR := device/google/raviole-kernel
+TARGET_KERNEL_DIR ?= device/google/raviole-kernel
+TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers
$(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-whitefin.mk)
$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json
index 16e5a16..2c7fdc8 100644
--- a/thermal_info_config_oriole.json
+++ b/thermal_info_config_oriole.json
@@ -206,6 +206,31 @@
"Multiplier":0.001
},
{
+ "Name":"VIRTUAL-QI-QUIET",
+ "Type":"UNKNOWN",
+ "VirtualSensor":true,
+ "Formula":"WEIGHTED_AVG",
+ "Combination":[
+ "qi_therm",
+ "quiet_therm"
+ ],
+ "Coefficient":[
+ "0.25",
+ "0.75"
+ ],
+ "HotThreshold":[
+ "NAN",
+ "NAN",
+ "NAN",
+ "NAN",
+ "NAN",
+ "NAN",
+ "NAN"
+ ],
+ "VrThreshold":"NAN",
+ "Multiplier":0.001
+ },
+ {
"Name":"VIRTUAL-QI-BATT",
"Type":"UNKNOWN",
"VirtualSensor":true,
@@ -291,7 +316,7 @@
"Formula":"MAXIMUM",
"Combination":[
"VIRTUAL-QI-GNSS",
- "VIRTUAL-QI-BATT",
+ "VIRTUAL-QI-QUIET",
"VIRTUAL-USB2-DISP",
"VIRTUAL-QUIET-BATT"
],
@@ -306,7 +331,7 @@
"39.0",
"43.0",
"45.0",
- "47.0",
+ "46.5",
"52.0",
"55.0"
],
@@ -315,7 +340,7 @@
1.9,
1.9,
1.9,
- 1.9,
+ 1.4,
1.9,
1.9
],
@@ -458,7 +483,7 @@
"Formula":"MAXIMUM",
"Combination":[
"VIRTUAL-QI-GNSS",
- "VIRTUAL-QI-BATT",
+ "VIRTUAL-QI-QUIET",
"VIRTUAL-USB2-DISP",
"VIRTUAL-QUIET-BATT"
],
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
},