[automerger skipped] [AOD] R4O6 Modify AOD brightness setting am: 46e67d17ed -s ours
am skip reason: Merged-In Ica79bc6fa0c8d15c6c123f9584d48bd71eaeb094 with SHA-1 8aaa9f71b7 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/15938216
Change-Id: Id5ab216b8c4a55074dff51ec218fad0c7166a5ba
diff --git a/audio/oriole/config/mixer_paths.xml b/audio/oriole/config/mixer_paths.xml
index 6a9b434..4080c14 100644
--- a/audio/oriole/config/mixer_paths.xml
+++ b/audio/oriole/config/mixer_paths.xml
@@ -528,7 +528,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/oriole/tuning/bluenote/recording.gatf b/audio/oriole/tuning/bluenote/recording.gatf
index b7c56da..1c9733f 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/mixer_paths.xml b/audio/raven/config/mixer_paths.xml
index 6a9b434..4080c14 100644
--- a/audio/raven/config/mixer_paths.xml
+++ b/audio/raven/config/mixer_paths.xml
@@ -528,7 +528,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/raven/tuning/bluenote/recording.gatf b/audio/raven/tuning/bluenote/recording.gatf
index b76c8ba..4c74dcb 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 22281a1..e53ebb3 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)
diff --git a/device-raven.mk b/device-raven.mk
index 0a07168..dc3b36f 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)
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)