Evolution-X-Tensor/device_google_raviole
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge SQ1D.211205.017.

Browse source 
Merged-In: I68825bf96c8b94dc63ebc096c57b9f7c680be090
Change-Id: I686001cbb0fe446fd3389d3c267d64fd9763bd3d
This commit is contained in:
Xin Li 2021-12-20 14:02:38 -08:00
commit 605793b34f
31 changed files with 199 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

2
audio/oriole/config/audio_platform_configuration.xml
View file

@ -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_AUDIO_RECORD" dev1="8" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
<usecase id="UC_HOSTLESS_UL" dev1="15"/> <usecase id="UC_HOSTLESS_UL" dev1="15"/>
<!-- for VOIP input, 4 * 10ms buffer --> <!-- 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--> <!-- 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"/> <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 --> <!-- for input wit AUDIO_INPUT_FLAG_MMAP_NOIRQ 240 periods * 1ms buffer, 32-bit,2 ch, buffer size 92160 bytes -->

2
audio/oriole/config/audio_policy_configuration.xml
View file

@ -32,7 +32,7 @@
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort> </mixPort>
<mixPort name="deep buffer" role="source" flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER"> <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"/> samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort> </mixPort>
<mixPort name="compressed_offload" role="source" <mixPort name="compressed_offload" role="source"

2
audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml
View file

@ -32,7 +32,7 @@
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort> </mixPort>
<mixPort name="deep buffer" role="source" flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER"> <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"/> samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort> </mixPort>
<mixPort name="compressed_offload" role="source" <mixPort name="compressed_offload" role="source"

2
audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml
View file

@ -32,7 +32,7 @@
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort> </mixPort>
<mixPort name="deep buffer" role="source" flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER"> <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"/> samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort> </mixPort>
<mixPort name="compressed_offload" role="source" <mixPort name="compressed_offload" role="source"

2
audio/oriole/config/audio_policy_volumes.xml
View file

@ -90,7 +90,7 @@ volume index from 0 to 100.
<volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEADSET" <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEADSET"
ref="DEFAULT_NON_MUTABLE_HEADSET_VOLUME_CURVE"/> ref="DEFAULT_NON_MUTABLE_HEADSET_VOLUME_CURVE"/>
<volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER"> <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>1,-3600</point> <point>0,-4800</point>
<point>33,-2400</point> <point>33,-2400</point>
<point>66,-1200</point> <point>66,-1200</point>
<point>100,0</point> <point>100,0</point>

16
audio/oriole/config/mixer_paths.xml
View file

@ -231,6 +231,7 @@
<ctl name="AoC Modem Downlink ASRC Mode" value="ASP_ON"/> <ctl name="AoC Modem Downlink ASRC Mode" value="ASP_ON"/>
<ctl name="Voice Call Mic Source" value="Builtin_MIC"/> <ctl name="Voice Call Mic Source" value="Builtin_MIC"/>
<ctl name="Mic Spatial Module Enable" value="0"/> <ctl name="Mic Spatial Module Enable" value="0"/>
<ctl name="Audio Capture Eraser Enable" value="0"/>
<!-- audio PDM mic default state --> <!-- audio PDM mic default state -->
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="-1"/> <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="-1"/>
@ -528,7 +529,6 @@
</path> </path>
<path name="voice-callC usb-headset-mic"> <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"/> <ctl name="EP4 TX Mixer USB_TX" value="1"/>
</path> </path>
@ -712,6 +712,20 @@
<ctl name="MIC Record Soft Gain (dB)" value="22"/> <ctl name="MIC Record Soft Gain (dB)" value="22"/>
</path> </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"> <path name="unprocessed-mic">
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/> <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="1" value="1"/>

BIN
audio/oriole/cs35l41/fw/cs35l41-dsp1-spk-prot.bin
View file

Binary file not shown.

BIN
audio/oriole/tuning/bluenote/recording.gatf
View file

Binary file not shown.

2
audio/oriole/tuning/bluenote/template.xml
View file

@ -273,7 +273,7 @@
<block id="137"> <block id="137">
<moduleRef id="14"/> <moduleRef id="14"/>
<moduleRef id="7"/> <moduleRef id="7"/>
<moduleRef id="32"/> <moduleRef id="8"/>
</block> </block>
</signalflow> </signalflow>
<signalflow id="1000" name="Smart Feature"> <signalflow id="1000" name="Smart Feature">

2
audio/raven/config/audio_platform_configuration.xml
View file

@ -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_AUDIO_RECORD" dev1="8" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
<usecase id="UC_HOSTLESS_UL" dev1="15"/> <usecase id="UC_HOSTLESS_UL" dev1="15"/>
<!-- for VOIP input, 4 * 10ms buffer --> <!-- 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--> <!-- 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"/> <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 --> <!-- for input wit AUDIO_INPUT_FLAG_MMAP_NOIRQ 240 periods * 1ms buffer, 32-bit,2 ch, buffer size 92160 bytes -->

2
audio/raven/config/audio_policy_configuration.xml
View file

@ -32,7 +32,7 @@
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort> </mixPort>
<mixPort name="deep buffer" role="source" flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER"> <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"/> samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort> </mixPort>
<mixPort name="compressed_offload" role="source" <mixPort name="compressed_offload" role="source"

2
audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml
View file

@ -32,7 +32,7 @@
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort> </mixPort>
<mixPort name="deep buffer" role="source" flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER"> <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"/> samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort> </mixPort>
<mixPort name="compressed_offload" role="source" <mixPort name="compressed_offload" role="source"

2
audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml
View file

@ -32,7 +32,7 @@
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort> </mixPort>
<mixPort name="deep buffer" role="source" flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER"> <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"/> samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort> </mixPort>
<mixPort name="compressed_offload" role="source" <mixPort name="compressed_offload" role="source"

2
audio/raven/config/audio_policy_volumes.xml
View file

@ -94,7 +94,7 @@ volume index from 0 to 100.
<volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEADSET" <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEADSET"
ref="DEFAULT_NON_MUTABLE_HEADSET_VOLUME_CURVE"/> ref="DEFAULT_NON_MUTABLE_HEADSET_VOLUME_CURVE"/>
<volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER"> <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>1,-3600</point> <point>0,-5200</point>
<point>33,-2400</point> <point>33,-2400</point>
<point>66,-1200</point> <point>66,-1200</point>
<point>100,0</point> <point>100,0</point>

16
audio/raven/config/mixer_paths.xml
View file

@ -231,6 +231,7 @@
<ctl name="AoC Modem Downlink ASRC Mode" value="ASP_ON"/> <ctl name="AoC Modem Downlink ASRC Mode" value="ASP_ON"/>
<ctl name="Voice Call Mic Source" value="Builtin_MIC"/> <ctl name="Voice Call Mic Source" value="Builtin_MIC"/>
<ctl name="Mic Spatial Module Enable" value="0"/> <ctl name="Mic Spatial Module Enable" value="0"/>
<ctl name="Audio Capture Eraser Enable" value="0"/>
<!-- audio PDM mic default state --> <!-- audio PDM mic default state -->
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="-1"/> <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="-1"/>
@ -528,7 +529,6 @@
</path> </path>
<path name="voice-callC usb-headset-mic"> <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"/> <ctl name="EP4 TX Mixer USB_TX" value="1"/>
</path> </path>
@ -712,6 +712,20 @@
<ctl name="MIC Record Soft Gain (dB)" value="22"/> <ctl name="MIC Record Soft Gain (dB)" value="22"/>
</path> </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"> <path name="unprocessed-mic">
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/> <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="1" value="1"/>

BIN
audio/raven/tuning/bluenote/recording.gatf
View file

Binary file not shown.

2
audio/raven/tuning/bluenote/template.xml
View file

@ -273,7 +273,7 @@
<block id="137"> <block id="137">
<moduleRef id="14"/> <moduleRef id="14"/>
<moduleRef id="7"/> <moduleRef id="7"/>
<moduleRef id="32"/> <moduleRef id="8"/>
</block> </block>
</signalflow> </signalflow>
<signalflow id="1000" name="Smart Feature"> <signalflow id="1000" name="Smart Feature">

2
audio/slider/config/audio_platform_configuration.xml
View file

@ -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_AUDIO_RECORD" dev1="8" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
<usecase id="UC_HOSTLESS_UL" dev1="15"/> <usecase id="UC_HOSTLESS_UL" dev1="15"/>
<!-- for VOIP input, 4 * 10ms buffer --> <!-- 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--> <!-- 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"/> <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 --> <!-- for input wit AUDIO_INPUT_FLAG_MMAP_NOIRQ 240 periods * 1ms buffer, 32-bit,2 ch, buffer size 92160 bytes -->

1
audio/slider/config/mixer_paths.xml
View file

@ -537,7 +537,6 @@
</path> </path>
<path name="voice-callC usb-headset-mic"> <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"/> <ctl name="EP4 TX Mixer USB_TX" value="1"/>
</path> </path>

2
audio/whitefin/config/audio_platform_configuration.xml
View file

@ -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_AUDIO_RECORD" dev1="8" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
<usecase id="UC_HOSTLESS_UL" dev1="15"/> <usecase id="UC_HOSTLESS_UL" dev1="15"/>
<!-- for VOIP input, 4 * 10ms buffer --> <!-- 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--> <!-- 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"/> <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 --> <!-- for input wit AUDIO_INPUT_FLAG_MMAP_NOIRQ 240 periods * 1ms buffer, 32-bit,2 ch, buffer size 92160 bytes -->

1
audio/whitefin/config/mixer_paths.xml
View file

@ -639,7 +639,6 @@
</path> </path>
<path name="voice-callC usb-headset-mic"> <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"/> <ctl name="EP4 TX Mixer USB_TX" value="1"/>
</path> </path>

5
device-oriole.mk
View file

@ -14,7 +14,8 @@
# limitations under the License. # 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/raviole/prebuilts/device-vendor-oriole.mk)
$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
@ -143,7 +144,7 @@ endif
# Increment the SVN for any official public releases # Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.build.svn=1 ro.vendor.build.svn=10
# Hide cutout overlays # Hide cutout overlays
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \

5
device-raven.mk
View file

@ -14,7 +14,8 @@
# limitations under the License. # 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/raviole/prebuilts/device-vendor-raven.mk)
$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
@ -144,7 +145,7 @@ endif
# Increment the SVN for any official public releases # Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.build.svn=1 ro.vendor.build.svn=10
# Hide cutout overlays # Hide cutout overlays
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \

3
device-slider.mk
View file

@ -14,7 +14,8 @@
# limitations under the License. # 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/raviole/prebuilts/device-vendor-slider.mk)
$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)

3
device-whitefin.mk
View file

@ -14,7 +14,8 @@
# limitations under the License. # 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/raviole/prebuilts/device-vendor-whitefin.mk)
$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)

3
oriole/overlay/frameworks/base/core/res/res/values/config.xml
View file

@ -214,6 +214,9 @@
<!-- default refresh rate in the high zone defined by birghtness and ambient thresholds --> <!-- default refresh rate in the high zone defined by birghtness and ambient thresholds -->
<integer name="config_fixedRefreshRateInHighZone">60</integer> <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. <!-- 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 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. --> refresh rate equates to a 34 ms delay. -->

4
oriole/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
View file

@ -42,8 +42,8 @@
<item>-1</item> <!-- 0: OFF --> <item>-1</item> <!-- 0: OFF -->
<item>5</item> <!-- 1: NIGHT --> <item>5</item> <!-- 1: NIGHT -->
<item>5</item> <!-- 2: LOW --> <item>5</item> <!-- 2: LOW -->
<item>200</item> <!-- 3: HIGH --> <item>16</item> <!-- 3: HIGH -->
<item>200</item> <!-- 4: SUN --> <item>16</item> <!-- 4: SUN -->
</integer-array> </integer-array>
<!-- Doze: Table that translates sensor values from the doze_brightness_sensor_type sensor <!-- Doze: Table that translates sensor values from the doze_brightness_sensor_type sensor

3
raven/overlay/frameworks/base/core/res/res/values/config.xml
View file

@ -99,6 +99,9 @@
<!-- default refresh rate in the zone defined by birghtness and ambient thresholds --> <!-- default refresh rate in the zone defined by birghtness and ambient thresholds -->
<integer name="config_defaultRefreshRateInZone">120</integer> <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. <!-- 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: The N entries of this array define N 1 zones as follows:
Zone 0: 0 <= LUX < array[0] Zone 0: 0 <= LUX < array[0]

4
raven/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
View file

@ -42,8 +42,8 @@
<item>-1</item> <!-- 0: OFF --> <item>-1</item> <!-- 0: OFF -->
<item>5</item> <!-- 1: NIGHT --> <item>5</item> <!-- 1: NIGHT -->
<item>5</item> <!-- 2: LOW --> <item>5</item> <!-- 2: LOW -->
<item>200</item> <!-- 3: HIGH --> <item>16</item> <!-- 3: HIGH -->
<item>200</item> <!-- 4: SUN --> <item>16</item> <!-- 4: SUN -->
</integer-array> </integer-array>
<!-- Doze: Table that translates sensor values from the doze_brightness_sensor_type sensor <!-- Doze: Table that translates sensor values from the doze_brightness_sensor_type sensor

93
thermal_info_config_oriole.json
View file

@ -205,6 +205,31 @@
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":0.001 "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", "Name":"VIRTUAL-QI-BATT",
"Type":"UNKNOWN", "Type":"UNKNOWN",
@ -291,7 +316,7 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":[ "Combination":[
"VIRTUAL-QI-GNSS", "VIRTUAL-QI-GNSS",
"VIRTUAL-QI-BATT", "VIRTUAL-QI-QUIET",
"VIRTUAL-USB2-DISP", "VIRTUAL-USB2-DISP",
"VIRTUAL-QUIET-BATT" "VIRTUAL-QUIET-BATT"
], ],
@ -306,7 +331,7 @@
"39.0", "39.0",
"43.0", "43.0",
"45.0", "45.0",
"47.0", "46.5",
"52.0", "52.0",
"55.0" "55.0"
], ],
@ -315,7 +340,7 @@
1.9, 1.9,
1.9, 1.9,
1.9, 1.9,
1.9, 1.4,
1.9, 1.9,
1.9 1.9
], ],
@ -373,18 +398,66 @@
"PowerThreshold": [200, 200, 200, 200, 50, 0, 0], "PowerThreshold": [200, 200, 200, 200, 50, 0, 0],
"ReleaseLogic": "DECREASE" "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", "CdevRequest": "fcc",
"LimitInfo": [0, 2, 3, 4, 4, 4, 4], "LimitInfo": [0, 2, 3, 3, 4, 4, 4],
"BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
"PowerThreshold": [500, 500, 500, 500, 0, 0, 0], "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", "ReleaseLogic": "RELEASE_TO_FLOOR",
"ThrottlingWithPowerLink":true "ThrottlingWithPowerLink":true
}, },
{ {
"CdevRequest": "dc_icl", "CdevRequest": "dc_icl",
"LimitInfo": [0, 1, 2, 4, 4, 4, 4], "LimitInfo": [0, 1, 2, 3, 4, 4, 4],
"BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
"PowerThreshold": [500, 500, 500, 500, 0, 0, 0], "PowerThreshold": [500, 500, 500, 500, 0, 0, 0],
"CdevFloorWithPowerLink": [0, 1, 2, 3, 4, 4, 4], "CdevFloorWithPowerLink": [0, 1, 2, 3, 4, 4, 4],
@ -393,16 +466,12 @@
}, },
{ {
"CdevRequest": "wlc_fcc", "CdevRequest": "wlc_fcc",
"LimitInfo": [0, 2, 2, 5, 5, 5, 5], "LimitInfo": [0, 2, 2, 4, 5, 5, 5],
"BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
"PowerThreshold": [500, 500, 500, 500, 0, 0, 0], "PowerThreshold": [500, 500, 500, 500, 0, 0, 0],
"CdevFloorWithPowerLink": [0, 1, 1, 2, 5, 5, 5], "CdevFloorWithPowerLink": [0, 1, 1, 2, 5, 5, 5],
"ReleaseLogic": "RELEASE_TO_FLOOR", "ReleaseLogic": "RELEASE_TO_FLOOR",
"ThrottlingWithPowerLink":true "ThrottlingWithPowerLink":true
},
{
"CdevRequest": "tpu_cooling",
"LimitInfo": [0, 1, 2, 3, 4, 4, 4]
} }
] ]
}, },
@ -414,7 +483,7 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":[ "Combination":[
"VIRTUAL-QI-GNSS", "VIRTUAL-QI-GNSS",
"VIRTUAL-QI-BATT", "VIRTUAL-QI-QUIET",
"VIRTUAL-USB2-DISP", "VIRTUAL-USB2-DISP",
"VIRTUAL-QUIET-BATT" "VIRTUAL-QUIET-BATT"
], ],

64
thermal_info_config_raven.json
View file

@ -373,36 +373,80 @@
"PowerThreshold": [200, 200, 200, 200, 50, 0, 0], "PowerThreshold": [200, 200, 200, 200, 50, 0, 0],
"ReleaseLogic": "DECREASE" "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", "CdevRequest": "fcc",
"LimitInfo": [0, 2, 3, 4, 4, 4, 4], "LimitInfo": [0, 2, 3, 3, 4, 4, 4],
"BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
"PowerThreshold": [500, 500, 500, 500, 500, 0, 0], "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", "ReleaseLogic": "RELEASE_TO_FLOOR",
"ThrottlingWithPowerLink":true "ThrottlingWithPowerLink":true
}, },
{ {
"CdevRequest": "dc_icl", "CdevRequest": "dc_icl",
"LimitInfo": [0, 1, 2, 4, 4, 4, 4], "LimitInfo": [0, 1, 2, 3, 4, 4, 4],
"BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
"PowerThreshold": [500, 500, 500, 500, 500, 0, 0], "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", "ReleaseLogic": "RELEASE_TO_FLOOR",
"ThrottlingWithPowerLink":true "ThrottlingWithPowerLink":true
}, },
{ {
"CdevRequest": "wlc_fcc", "CdevRequest": "wlc_fcc",
"LimitInfo": [0, 2, 2, 3, 4, 4, 4], "LimitInfo": [0, 3, 3, 4, 5, 5, 5],
"BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
"PowerThreshold": [500, 500, 500, 500, 500, 0, 0], "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", "ReleaseLogic": "RELEASE_TO_FLOOR",
"ThrottlingWithPowerLink":true "ThrottlingWithPowerLink":true
},
{
"CdevRequest": "tpu_cooling",
"LimitInfo": [0, 1, 2, 3, 4, 4, 4]
} }
] ]
}, },