Merge SQ1D.211205.017.
Merged-In: I68825bf96c8b94dc63ebc096c57b9f7c680be090
Change-Id: I686001cbb0fe446fd3389d3c267d64fd9763bd3d
diff --git a/audio/oriole/config/audio_platform_configuration.xml b/audio/oriole/config/audio_platform_configuration.xml
index 433c21f..6bc6159 100644
--- a/audio/oriole/config/audio_platform_configuration.xml
+++ b/audio/oriole/config/audio_platform_configuration.xml
@@ -192,7 +192,7 @@
<usecase id="UC_AUDIO_RECORD" dev1="8" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
<usecase id="UC_HOSTLESS_UL" dev1="15"/>
<!-- for VOIP input, 4 * 10ms buffer -->
- <usecase id="UC_VOIP_RECORD" dev1="17" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
+ <usecase id="UC_VOIP_RECORD" dev1="17" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="2"/>
<!-- for input wit AUDIO_INPUT_FLAG_FAST 480 periods * 1ms buffer, 16-bit, 2ch, buffer size 92160 bytes-->
<usecase id="UC_LOW_LATENCY_AUDIO_RECORD" dev1="10" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="480"/>
<!-- for input wit AUDIO_INPUT_FLAG_MMAP_NOIRQ 240 periods * 1ms buffer, 32-bit,2 ch, buffer size 92160 bytes -->
diff --git a/audio/oriole/config/audio_policy_configuration.xml b/audio/oriole/config/audio_policy_configuration.xml
index 188d533..90ee1c3 100644
--- a/audio/oriole/config/audio_policy_configuration.xml
+++ b/audio/oriole/config/audio_policy_configuration.xml
@@ -32,7 +32,7 @@
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="deep buffer" role="source" flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER">
- <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+ <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="compressed_offload" role="source"
diff --git a/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml
index c3e64c0..ea540e8 100644
--- a/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -32,7 +32,7 @@
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="deep buffer" role="source" flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER">
- <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+ <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="compressed_offload" role="source"
diff --git a/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml
index d0b1986..0623ec4 100644
--- a/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -32,7 +32,7 @@
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="deep buffer" role="source" flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER">
- <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+ <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="compressed_offload" role="source"
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..f0160d4 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..52a75ba 100644
--- a/audio/oriole/tuning/bluenote/template.xml
+++ b/audio/oriole/tuning/bluenote/template.xml
@@ -273,7 +273,7 @@
<block id="137">
<moduleRef id="14"/>
<moduleRef id="7"/>
- <moduleRef id="32"/>
+ <moduleRef id="8"/>
</block>
</signalflow>
<signalflow id="1000" name="Smart Feature">
diff --git a/audio/raven/config/audio_platform_configuration.xml b/audio/raven/config/audio_platform_configuration.xml
index 433c21f..6bc6159 100644
--- a/audio/raven/config/audio_platform_configuration.xml
+++ b/audio/raven/config/audio_platform_configuration.xml
@@ -192,7 +192,7 @@
<usecase id="UC_AUDIO_RECORD" dev1="8" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
<usecase id="UC_HOSTLESS_UL" dev1="15"/>
<!-- for VOIP input, 4 * 10ms buffer -->
- <usecase id="UC_VOIP_RECORD" dev1="17" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
+ <usecase id="UC_VOIP_RECORD" dev1="17" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="2"/>
<!-- for input wit AUDIO_INPUT_FLAG_FAST 480 periods * 1ms buffer, 16-bit, 2ch, buffer size 92160 bytes-->
<usecase id="UC_LOW_LATENCY_AUDIO_RECORD" dev1="10" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="480"/>
<!-- for input wit AUDIO_INPUT_FLAG_MMAP_NOIRQ 240 periods * 1ms buffer, 32-bit,2 ch, buffer size 92160 bytes -->
diff --git a/audio/raven/config/audio_policy_configuration.xml b/audio/raven/config/audio_policy_configuration.xml
index 188d533..90ee1c3 100644
--- a/audio/raven/config/audio_policy_configuration.xml
+++ b/audio/raven/config/audio_policy_configuration.xml
@@ -32,7 +32,7 @@
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="deep buffer" role="source" flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER">
- <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+ <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="compressed_offload" role="source"
diff --git a/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml
index c3e64c0..ea540e8 100644
--- a/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -32,7 +32,7 @@
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="deep buffer" role="source" flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER">
- <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+ <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="compressed_offload" role="source"
diff --git a/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml
index d0b1986..0623ec4 100644
--- a/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -32,7 +32,7 @@
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="deep buffer" role="source" flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER">
- <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+ <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="compressed_offload" role="source"
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..61a6f5e 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..52a75ba 100644
--- a/audio/raven/tuning/bluenote/template.xml
+++ b/audio/raven/tuning/bluenote/template.xml
@@ -273,7 +273,7 @@
<block id="137">
<moduleRef id="14"/>
<moduleRef id="7"/>
- <moduleRef id="32"/>
+ <moduleRef id="8"/>
</block>
</signalflow>
<signalflow id="1000" name="Smart Feature">
diff --git a/audio/slider/config/audio_platform_configuration.xml b/audio/slider/config/audio_platform_configuration.xml
index fcf760e..bc63066 100644
--- a/audio/slider/config/audio_platform_configuration.xml
+++ b/audio/slider/config/audio_platform_configuration.xml
@@ -130,7 +130,7 @@
<usecase id="UC_AUDIO_RECORD" dev1="8" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
<usecase id="UC_HOSTLESS_UL" dev1="15"/>
<!-- for VOIP input, 4 * 10ms buffer -->
- <usecase id="UC_VOIP_RECORD" dev1="17" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
+ <usecase id="UC_VOIP_RECORD" dev1="17" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="2"/>
<!-- for input wit AUDIO_INPUT_FLAG_FAST 480 periods * 1ms buffer, 16-bit, 2ch, buffer size 92160 bytes-->
<usecase id="UC_LOW_LATENCY_AUDIO_RECORD" dev1="10" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="480"/>
<!-- for input wit AUDIO_INPUT_FLAG_MMAP_NOIRQ 240 periods * 1ms buffer, 32-bit,2 ch, buffer size 92160 bytes -->
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/audio_platform_configuration.xml b/audio/whitefin/config/audio_platform_configuration.xml
index fcf760e..bc63066 100644
--- a/audio/whitefin/config/audio_platform_configuration.xml
+++ b/audio/whitefin/config/audio_platform_configuration.xml
@@ -130,7 +130,7 @@
<usecase id="UC_AUDIO_RECORD" dev1="8" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
<usecase id="UC_HOSTLESS_UL" dev1="15"/>
<!-- for VOIP input, 4 * 10ms buffer -->
- <usecase id="UC_VOIP_RECORD" dev1="17" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
+ <usecase id="UC_VOIP_RECORD" dev1="17" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="2"/>
<!-- for input wit AUDIO_INPUT_FLAG_FAST 480 periods * 1ms buffer, 16-bit, 2ch, buffer size 92160 bytes-->
<usecase id="UC_LOW_LATENCY_AUDIO_RECORD" dev1="10" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="480"/>
<!-- for input wit AUDIO_INPUT_FLAG_MMAP_NOIRQ 240 periods * 1ms buffer, 32-bit,2 ch, buffer size 92160 bytes -->
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 e58ce7e..17a1d89 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=1
+ ro.vendor.build.svn=10
# Hide cutout overlays
PRODUCT_PACKAGES += \
diff --git a/device-raven.mk b/device-raven.mk
index c0190a0..dcce448 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=1
+ ro.vendor.build.svn=10
# 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/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
index 4fcf00e..267bc29 100644
--- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
@@ -214,6 +214,9 @@
<!-- default refresh rate in the high zone defined by birghtness and ambient thresholds -->
<integer name="config_fixedRefreshRateInHighZone">60</integer>
+ <!-- Default refresh rate while the device has high brightness mode enabled for HDR. -->
+ <integer name="config_defaultRefreshRateInHbmHdr">60</integer>
+
<!-- How long it takes for the HW to start illuminating after the illumination is requested.
It takes 3 frames to enable the Local High-Brightness Mode (LHBM), which at 90 Hz screen
refresh rate equates to a 34 ms delay. -->
diff --git a/oriole/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/oriole/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index 21b9084..bef96a1 100644
--- a/oriole/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/oriole/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -42,8 +42,8 @@
<item>-1</item> <!-- 0: OFF -->
<item>5</item> <!-- 1: NIGHT -->
<item>5</item> <!-- 2: LOW -->
- <item>200</item> <!-- 3: HIGH -->
- <item>200</item> <!-- 4: SUN -->
+ <item>16</item> <!-- 3: HIGH -->
+ <item>16</item> <!-- 4: SUN -->
</integer-array>
<!-- Doze: Table that translates sensor values from the doze_brightness_sensor_type sensor
diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml
index c87a532..ba283e6 100644
--- a/raven/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml
@@ -99,6 +99,9 @@
<!-- default refresh rate in the zone defined by birghtness and ambient thresholds -->
<integer name="config_defaultRefreshRateInZone">120</integer>
+ <!-- Default refresh rate while the device has high brightness mode enabled for HDR. -->
+ <integer name="config_defaultRefreshRateInHbmHdr">60</integer>
+
<!-- Array of light sensor LUX values to define our levels for auto backlight brightness support.
The N entries of this array define N 1 zones as follows:
Zone 0: 0 <= LUX < array[0]
diff --git a/raven/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/raven/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index a5bb8e3..45336e6 100644
--- a/raven/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/raven/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -42,8 +42,8 @@
<item>-1</item> <!-- 0: OFF -->
<item>5</item> <!-- 1: NIGHT -->
<item>5</item> <!-- 2: LOW -->
- <item>200</item> <!-- 3: HIGH -->
- <item>200</item> <!-- 4: SUN -->
+ <item>16</item> <!-- 3: HIGH -->
+ <item>16</item> <!-- 4: SUN -->
</integer-array>
<!-- Doze: Table that translates sensor values from the doze_brightness_sensor_type sensor
diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json
index 7e201c0..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
],
@@ -374,17 +399,65 @@
"ReleaseLogic": "DECREASE"
},
{
+ "CdevRequest": "tpu_cooling",
+ "LimitInfo": [0, 1, 2, 3, 4, 4, 4]
+ }
+ ]
+ },
+ {
+ "Name":"VIRTUAL-SKIN-CHARGE",
+ "Type":"UNKNOWN",
+ "VirtualSensor":true,
+ "TriggerSensor":"quiet_therm",
+ "Formula":"MAXIMUM",
+ "Combination":[
+ "VIRTUAL-QI-GNSS",
+ "VIRTUAL-QI-BATT",
+ "VIRTUAL-USB2-DISP",
+ "VIRTUAL-QUIET-BATT"
+ ],
+ "Coefficient":[
+ "1.0",
+ "1.0",
+ "1.0",
+ "1.0"
+ ],
+ "HotThreshold":[
+ "NAN",
+ "39.0",
+ "41.0",
+ "43.0",
+ "45.0",
+ "47.0",
+ "55.0"
+ ],
+ "HotHysteresis":[
+ 0.0,
+ 1.9,
+ 1.9,
+ 1.9,
+ 1.9,
+ 1.9,
+ 1.9
+ ],
+ "VrThreshold":"NAN",
+ "Multiplier":0.001,
+ "Monitor":true,
+ "PollingDelay":300000,
+ "PassiveDelay":7000,
+ "BindedCdevInfo": [
+ {
"CdevRequest": "fcc",
- "LimitInfo": [0, 2, 3, 4, 4, 4, 4],
+ "LimitInfo": [0, 2, 3, 3, 4, 4, 4],
"BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
"PowerThreshold": [500, 500, 500, 500, 0, 0, 0],
- "CdevFloorWithPowerLink": [0, 0, 1, 2, 4 ,4 ,4],
+ "CdevFloorWithPowerLink": [0, 0, 2, 2, 4 ,4 ,4],
"ReleaseLogic": "RELEASE_TO_FLOOR",
"ThrottlingWithPowerLink":true
},
{
"CdevRequest": "dc_icl",
- "LimitInfo": [0, 1, 2, 4, 4, 4, 4],
+ "LimitInfo": [0, 1, 2, 3, 4, 4, 4],
"BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
"PowerThreshold": [500, 500, 500, 500, 0, 0, 0],
"CdevFloorWithPowerLink": [0, 1, 2, 3, 4, 4, 4],
@@ -393,16 +466,12 @@
},
{
"CdevRequest": "wlc_fcc",
- "LimitInfo": [0, 2, 2, 5, 5, 5, 5],
+ "LimitInfo": [0, 2, 2, 4, 5, 5, 5],
"BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
"PowerThreshold": [500, 500, 500, 500, 0, 0, 0],
"CdevFloorWithPowerLink": [0, 1, 1, 2, 5, 5, 5],
"ReleaseLogic": "RELEASE_TO_FLOOR",
"ThrottlingWithPowerLink":true
- },
- {
- "CdevRequest": "tpu_cooling",
- "LimitInfo": [0, 1, 2, 3, 4, 4, 4]
}
]
},
@@ -414,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 66f5af7..c01ece3 100644
--- a/thermal_info_config_raven.json
+++ b/thermal_info_config_raven.json
@@ -374,35 +374,79 @@
"ReleaseLogic": "DECREASE"
},
{
+ "CdevRequest": "tpu_cooling",
+ "LimitInfo": [0, 1, 2, 3, 4, 4, 4]
+ }
+ ]
+ },
+ {
+ "Name":"VIRTUAL-SKIN-CHARGE",
+ "Type":"UNKNOWN",
+ "VirtualSensor":true,
+ "TriggerSensor":"quiet_therm",
+ "Formula":"MAXIMUM",
+ "Combination":[
+ "VIRTUAL-NEUTRAL-QI",
+ "VIRTUAL-USB2-BATT",
+ "VIRTUAL-GNSS-BATT",
+ "VIRTUAL-QI-DISP"
+ ],
+ "Coefficient":[
+ "1.0",
+ "1.0",
+ "1.0",
+ "1.0"
+ ],
+ "HotThreshold":[
+ "NAN",
+ "39.0",
+ "41.0",
+ "43.0",
+ "45.0",
+ "47.0",
+ "55.0"
+ ],
+ "HotHysteresis":[
+ 0.0,
+ 1.9,
+ 1.9,
+ 1.9,
+ 1.9,
+ 1.9,
+ 1.9
+ ],
+ "VrThreshold":"NAN",
+ "Multiplier":0.001,
+ "Monitor":true,
+ "PollingDelay":300000,
+ "PassiveDelay":7000,
+ "BindedCdevInfo": [
+ {
"CdevRequest": "fcc",
- "LimitInfo": [0, 2, 3, 4, 4, 4, 4],
+ "LimitInfo": [0, 2, 3, 3, 4, 4, 4],
"BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
"PowerThreshold": [500, 500, 500, 500, 500, 0, 0],
- "CdevFloorWithPowerLink": [0, 0, 1, 2, 3 ,4 ,4],
+ "CdevFloorWithPowerLink": [0, 0, 2, 2, 3 ,4 ,4],
"ReleaseLogic": "RELEASE_TO_FLOOR",
"ThrottlingWithPowerLink":true
},
{
"CdevRequest": "dc_icl",
- "LimitInfo": [0, 1, 2, 4, 4, 4, 4],
+ "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
},
{
"CdevRequest": "wlc_fcc",
- "LimitInfo": [0, 2, 2, 3, 4, 4, 4],
+ "LimitInfo": [0, 3, 3, 4, 5, 5, 5],
"BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
"PowerThreshold": [500, 500, 500, 500, 500, 0, 0],
- "CdevFloorWithPowerLink": [0, 1, 1, 2, 3, 4, 4],
+ "CdevFloorWithPowerLink": [0, 1, 2, 3, 4, 5, 5],
"ReleaseLogic": "RELEASE_TO_FLOOR",
"ThrottlingWithPowerLink":true
- },
- {
- "CdevRequest": "tpu_cooling",
- "LimitInfo": [0, 1, 2, 3, 4, 4, 4]
}
]
},