Snap for 11784291 from 6f3b88fabd to 24Q3-release

Change-Id: Ib1bdaf916714d14b9fdffead97c8a03b81a7344d
This commit is contained in:
Android Build Coastguard Worker 2024-04-30 23:02:32 +00:00
commit 34463747b1
34 changed files with 403 additions and 37 deletions

View file

@ -20,7 +20,7 @@ USE_SWIFTSHADER := false
BOARD_USES_SWIFTSHADER := false
$(call inherit-product, device/google/zumapro/aosp_common.mk)
$(call inherit-product, device/google/caimito/device-caiman.mk)
$(call inherit-product, device/google/caimito/caiman_generic.mk)
PRODUCT_NAME := aosp_caiman
PRODUCT_DEVICE := caiman

View file

@ -20,7 +20,7 @@ USE_SWIFTSHADER := false
BOARD_USES_SWIFTSHADER := false
$(call inherit-product, device/google/zumapro/aosp_common.mk)
$(call inherit-product, device/google/caimito/device-komodo.mk)
$(call inherit-product, device/google/caimito/komodo_generic.mk)
PRODUCT_NAME := aosp_komodo
PRODUCT_DEVICE := komodo

View file

@ -20,7 +20,7 @@ USE_SWIFTSHADER := false
BOARD_USES_SWIFTSHADER := false
$(call inherit-product, device/google/zumapro/aosp_common.mk)
$(call inherit-product, device/google/caimito/device-ripcurrentpro.mk)
$(call inherit-product, device/google/caimito/ripcurrentpro_generic.mk)
PRODUCT_NAME := aosp_ripcurrentpro
PRODUCT_DEVICE := ripcurrentpro

View file

@ -20,7 +20,7 @@ USE_SWIFTSHADER := false
BOARD_USES_SWIFTSHADER := false
$(call inherit-product, device/google/zumapro/aosp_common.mk)
$(call inherit-product, device/google/caimito/device-tokay.mk)
$(call inherit-product, device/google/caimito/tokay_generic.mk)
PRODUCT_NAME := aosp_tokay
PRODUCT_DEVICE := tokay

17
caiman_generic.mk Normal file
View file

@ -0,0 +1,17 @@
#
# Copyright 2024 The Android Open-Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
$(call inherit-product, device/google/caimito/device-caiman.mk)

View file

@ -383,6 +383,10 @@ PRODUCT_PRODUCT_PROPERTIES += \
PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.leaudio.allow_list=SM-R510
# Support LE & Classic concurrent encryption (b/330704060)
PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.ble.allow_enc_with_bredr=true
# Keyboard height ratio and bottom padding in dp for portrait mode
PRODUCT_PRODUCT_PROPERTIES += \
ro.com.google.ime.kb_pad_port_b=8 \

View file

@ -380,6 +380,10 @@ PRODUCT_PRODUCT_PROPERTIES += \
PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.leaudio.allow_list=SM-R510
# Support LE & Classic concurrent encryption (b/330704060)
PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.ble.allow_enc_with_bredr=true
# Exynos RIL and telephony
# Support RIL Domain-selection
SUPPORT_RIL_DOMAIN_SELECTION := true

View file

@ -347,6 +347,10 @@ PRODUCT_PRODUCT_PROPERTIES += \
PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.leaudio.allow_list=SM-R510
# Support LE & Classic concurrent encryption (b/330704060)
PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.ble.allow_enc_with_bredr=true
# Exynos RIL and telephony
# Support RIL Domain-selection
SUPPORT_RIL_DOMAIN_SELECTION := true

View file

@ -37,6 +37,9 @@ PRODUCT_PROPERTY_OVERRIDES += \
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_SOONG_NAMESPACES += \
vendor/qcom/fingerprint/QFPCalibration
PRODUCT_PACKAGES += \
QFPCalibration
endif
ifneq (,$(findstring factory, $(TARGET_PRODUCT)))

17
komodo_generic.mk Normal file
View file

@ -0,0 +1,17 @@
#
# Copyright 2024 The Android Open-Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
$(call inherit-product, device/google/caimito/device-komodo.mk)

View file

@ -7,7 +7,7 @@ GlueLayer_EnableGnssCfgInterface=1
gnss_device_type=K042
gnss_device_patch_address=0
gnss_device_patch_file=/vendor/firmware/kepler.bin
ism_stream_enable=0
ism_stream_enable=1
caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
MaxNtnRefLocAgeSecs=600
GlueLayer_IsPlatformRefTimeEnable=1
@ -49,7 +49,7 @@ GlueLayer_isReqDBHFromFwRefLoc=1
GlueLayer_isReqUBPFromPressureSensor=1
GlueLayer_IsMemsEnable=1
GlueLayer_MeasCorrCap=7
Chip_Configuration_mems_data_Configuration=0x7
Chip_Configuration_mems_data_Configuration=0x5
Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
CP_LocTech_PrimaryConst=0
CP_LocTech_Constraints=0x81

View file

@ -21,7 +21,7 @@ gnss_device_patch_address=0
gnss_device_patch_file=/vendor/firmware/kepler.bin
# enable ism stream for GAAM
ism_stream_enable=0
ism_stream_enable=1
caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
MaxNtnRefLocAgeSecs=600
@ -175,7 +175,7 @@ GlueLayer_isReqDBHFromFwRefLoc=1
GlueLayer_isReqUBPFromPressureSensor=1
GlueLayer_IsMemsEnable=1
GlueLayer_MeasCorrCap=7
Chip_Configuration_mems_data_Configuration=0x7
Chip_Configuration_mems_data_Configuration=0x5
Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
CP_LocTech_PrimaryConst=0
CP_LocTech_Constraints=0x81

View file

@ -7,7 +7,7 @@ GlueLayer_EnableGnssCfgInterface=1
gnss_device_type=K042
gnss_device_patch_address=0
gnss_device_patch_file=/vendor/firmware/kepler.bin
ism_stream_enable=0
ism_stream_enable=1
caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
MaxNtnRefLocAgeSecs=600
GlueLayer_IsPlatformRefTimeEnable=1
@ -49,7 +49,7 @@ GlueLayer_isReqDBHFromFwRefLoc=1
GlueLayer_isReqUBPFromPressureSensor=1
GlueLayer_IsMemsEnable=1
GlueLayer_MeasCorrCap=7
Chip_Configuration_mems_data_Configuration=0x7
Chip_Configuration_mems_data_Configuration=0x5
Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
CP_LocTech_PrimaryConst=0
CP_LocTech_Constraints=0x81

View file

@ -21,7 +21,7 @@ gnss_device_patch_address=0
gnss_device_patch_file=/vendor/firmware/kepler.bin
# enable ism stream for GAAM
ism_stream_enable=0
ism_stream_enable=1
caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
MaxNtnRefLocAgeSecs=600
@ -175,7 +175,7 @@ GlueLayer_isReqDBHFromFwRefLoc=1
GlueLayer_isReqUBPFromPressureSensor=1
GlueLayer_IsMemsEnable=1
GlueLayer_MeasCorrCap=7
Chip_Configuration_mems_data_Configuration=0x7
Chip_Configuration_mems_data_Configuration=0x5
Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
CP_LocTech_PrimaryConst=0
CP_LocTech_Constraints=0x81

View file

@ -7,7 +7,7 @@ GlueLayer_EnableGnssCfgInterface=1
gnss_device_type=K042
gnss_device_patch_address=0
gnss_device_patch_file=/vendor/firmware/kepler.bin
ism_stream_enable=0
ism_stream_enable=1
caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
MaxNtnRefLocAgeSecs=600
GlueLayer_IsPlatformRefTimeEnable=1
@ -48,7 +48,7 @@ GlueLayer_isReqDBHFromFwRefLoc=1
GlueLayer_isReqUBPFromPressureSensor=1
GlueLayer_IsMemsEnable=1
GlueLayer_MeasCorrCap=7
Chip_Configuration_mems_data_Configuration=0x7
Chip_Configuration_mems_data_Configuration=0x5
Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
CP_LocTech_PrimaryConst=0
CP_LocTech_Constraints=0x81

View file

@ -21,7 +21,7 @@ gnss_device_patch_address=0
gnss_device_patch_file=/vendor/firmware/kepler.bin
# enable ism stream for GAAM
ism_stream_enable=0
ism_stream_enable=1
caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
MaxNtnRefLocAgeSecs=600
@ -174,7 +174,7 @@ GlueLayer_isReqDBHFromFwRefLoc=1
GlueLayer_isReqUBPFromPressureSensor=1
GlueLayer_IsMemsEnable=1
GlueLayer_MeasCorrCap=7
Chip_Configuration_mems_data_Configuration=0x7
Chip_Configuration_mems_data_Configuration=0x5
Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
CP_LocTech_PrimaryConst=0
CP_LocTech_Constraints=0x81

View file

@ -7,7 +7,7 @@ GlueLayer_EnableGnssCfgInterface=1
gnss_device_type=K042
gnss_device_patch_address=0
gnss_device_patch_file=/vendor/firmware/kepler.bin
ism_stream_enable=0
ism_stream_enable=1
caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
MaxNtnRefLocAgeSecs=600
GlueLayer_IsPlatformRefTimeEnable=1
@ -48,7 +48,7 @@ GlueLayer_isReqDBHFromFwRefLoc=1
GlueLayer_isReqUBPFromPressureSensor=1
GlueLayer_IsMemsEnable=1
GlueLayer_MeasCorrCap=7
Chip_Configuration_mems_data_Configuration=0x7
Chip_Configuration_mems_data_Configuration=0x5
Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
CP_LocTech_PrimaryConst=0
CP_LocTech_Constraints=0x81

View file

@ -21,7 +21,7 @@ gnss_device_patch_address=0
gnss_device_patch_file=/vendor/firmware/kepler.bin
# enable ism stream for GAAM
ism_stream_enable=0
ism_stream_enable=1
caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
MaxNtnRefLocAgeSecs=600
@ -174,7 +174,7 @@ GlueLayer_isReqDBHFromFwRefLoc=1
GlueLayer_isReqUBPFromPressureSensor=1
GlueLayer_IsMemsEnable=1
GlueLayer_MeasCorrCap=7
Chip_Configuration_mems_data_Configuration=0x37
Chip_Configuration_mems_data_Configuration=0x5
Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
CP_LocTech_PrimaryConst=0
CP_LocTech_Constraints=0x81

View file

@ -7,7 +7,7 @@ GlueLayer_EnableGnssCfgInterface=1
gnss_device_type=K042
gnss_device_patch_address=0
gnss_device_patch_file=/vendor/firmware/kepler.bin
ism_stream_enable=0
ism_stream_enable=1
caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
MaxNtnRefLocAgeSecs=600
GlueLayer_IsPlatformRefTimeEnable=1
@ -49,7 +49,7 @@ GlueLayer_isReqDBHFromFwRefLoc=1
GlueLayer_isReqUBPFromPressureSensor=1
GlueLayer_IsMemsEnable=1
GlueLayer_MeasCorrCap=7
Chip_Configuration_mems_data_Configuration=0x7
Chip_Configuration_mems_data_Configuration=0x5
Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
CP_LocTech_PrimaryConst=0
CP_LocTech_Constraints=0x81

View file

@ -21,7 +21,7 @@ gnss_device_patch_address=0
gnss_device_patch_file=/vendor/firmware/kepler.bin
# enable ism stream for GAAM
ism_stream_enable=0
ism_stream_enable=1
caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
MaxNtnRefLocAgeSecs=600
@ -175,7 +175,7 @@ GlueLayer_isReqDBHFromFwRefLoc=1
GlueLayer_isReqUBPFromPressureSensor=1
GlueLayer_IsMemsEnable=1
GlueLayer_MeasCorrCap=7
Chip_Configuration_mems_data_Configuration=0x7
Chip_Configuration_mems_data_Configuration=0x5
Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
CP_LocTech_PrimaryConst=0
CP_LocTech_Constraints=0x81

View file

@ -763,6 +763,7 @@
"1800000",
"1548000",
"820000",
"610000",
"0"
],
"ResetOnInit": true
@ -1874,7 +1875,7 @@
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "DsuMinFreq",
"Duration": 0,
"Value": "820000"
"Value": "610000"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
@ -1966,6 +1967,12 @@
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CDPreferIdle",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "AutoPreferIdle",
@ -3103,6 +3110,8 @@
"UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
"SamplingWindow_D": 1,
@ -3138,6 +3147,8 @@
"UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
"SamplingWindow_D": 1,
@ -3173,6 +3184,8 @@
"UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
"SamplingWindow_D": 1,
@ -3209,6 +3222,8 @@
"UclampMin_Init": 250,
"UclampMin_High": 196,
"UclampMin_Low": 196,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0,
@ -3232,6 +3247,8 @@
"UclampMin_Init": 250,
"UclampMin_High": 52,
"UclampMin_Low": 52,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0,
@ -3255,6 +3272,8 @@
"UclampMin_Init": 250,
"UclampMin_High": 0,
"UclampMin_Low": 0,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0,

View file

@ -763,6 +763,7 @@
"1800000",
"1548000",
"820000",
"610000",
"0"
],
"ResetOnInit": true
@ -1874,7 +1875,7 @@
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "DsuMinFreq",
"Duration": 0,
"Value": "820000"
"Value": "610000"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
@ -1966,6 +1967,12 @@
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CDPreferIdle",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "AutoPreferIdle",
@ -3103,6 +3110,8 @@
"UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
"SamplingWindow_D": 1,
@ -3138,6 +3147,8 @@
"UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
"SamplingWindow_D": 1,
@ -3173,6 +3184,8 @@
"UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
"SamplingWindow_D": 1,
@ -3209,6 +3222,8 @@
"UclampMin_Init": 250,
"UclampMin_High": 196,
"UclampMin_Low": 196,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 15.0,
@ -3232,6 +3247,8 @@
"UclampMin_Init": 250,
"UclampMin_High": 52,
"UclampMin_Low": 52,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 15.0,
@ -3255,6 +3272,8 @@
"UclampMin_Init": 250,
"UclampMin_High": 0,
"UclampMin_Low": 0,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 15.0,

View file

@ -2188,6 +2188,8 @@
"UclampMin_LoadReset": 384,
"UclampMin_High": 384,
"UclampMin_Low": 2,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
"SamplingWindow_D": 1,
@ -2212,6 +2214,8 @@
"UclampMin_LoadReset": 384,
"UclampMin_High": 384,
"UclampMin_Low": 2,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
"SamplingWindow_D": 1,
@ -2236,6 +2240,8 @@
"UclampMin_LoadReset": 384,
"UclampMin_High": 384,
"UclampMin_Low": 2,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
"SamplingWindow_D": 1,
@ -2261,6 +2267,8 @@
"UclampMin_Init": 200,
"UclampMin_High": 157,
"UclampMin_Low": 157,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0
@ -2283,6 +2291,8 @@
"UclampMin_Init": 200,
"UclampMin_High": 42,
"UclampMin_Low": 42,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0
@ -2305,6 +2315,8 @@
"UclampMin_Init": 200,
"UclampMin_High": 0,
"UclampMin_Low": 0,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0

View file

@ -53,6 +53,7 @@
"1800000",
"1548000",
"820000",
"610000",
"0"
],
"ResetOnInit": true
@ -1863,7 +1864,7 @@
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "DsuMinFreq",
"Duration": 0,
"Value": "820000"
"Value": "610000"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
@ -1955,6 +1956,12 @@
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CDPreferIdle",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "AutoPreferIdle",

View file

@ -763,6 +763,7 @@
"1800000",
"1548000",
"820000",
"610000",
"0"
],
"ResetOnInit": true
@ -1874,7 +1875,7 @@
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "DsuMinFreq",
"Duration": 0,
"Value": "820000"
"Value": "610000"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
@ -1966,6 +1967,12 @@
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "CDPreferIdle",
"Duration": 0,
"Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "AutoPreferIdle",
@ -3103,6 +3110,8 @@
"UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
"SamplingWindow_D": 1,
@ -3138,6 +3147,8 @@
"UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
"SamplingWindow_D": 1,
@ -3173,6 +3184,8 @@
"UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
"SamplingWindow_D": 1,
@ -3209,6 +3222,8 @@
"UclampMin_Init": 250,
"UclampMin_High": 196,
"UclampMin_Low": 196,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0,
@ -3232,6 +3247,8 @@
"UclampMin_Init": 250,
"UclampMin_High": 52,
"UclampMin_Low": 52,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0,
@ -3255,6 +3272,8 @@
"UclampMin_Init": 250,
"UclampMin_High": 0,
"UclampMin_Low": 0,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0,

View file

@ -2744,6 +2744,8 @@
"UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
"SamplingWindow_D": 1,
@ -2768,6 +2770,8 @@
"UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
"SamplingWindow_D": 1,
@ -2792,6 +2796,8 @@
"UclampMin_LoadReset": 480,
"UclampMin_High": 480,
"UclampMin_Low": 2,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
"SamplingWindow_D": 1,
@ -2817,6 +2823,8 @@
"UclampMin_Init": 250,
"UclampMin_High": 196,
"UclampMin_Low": 196,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0
@ -2839,6 +2847,8 @@
"UclampMin_Init": 250,
"UclampMin_High": 52,
"UclampMin_Low": 52,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0
@ -2861,6 +2871,8 @@
"UclampMin_Init": 250,
"UclampMin_High": 0,
"UclampMin_Low": 0,
"UclampMax_EfficientBase": 500,
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0

17
ripcurrentpro_generic.mk Normal file
View file

@ -0,0 +1,17 @@
#
# Copyright 2024 The Android Open-Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
$(call inherit-product, device/google/caimito/device-ripcurrentpro.mk)

View file

@ -173,10 +173,31 @@
"Combination": ["battery", "btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"],
"Multiplier": 0.001,
"PreviousSampleCount": 3,
"BackupSensor" : "VIRTUAL-SKIN-LEGACY",
"OffsetThresholds" : [50000, 53000],
"OffsetValues" : [500, 1000],
"ValidateInput": true
"SupportUnderSampling": true
},
{
"Name": "VIRTUAL-SKIN-MODEL-UPPER-CLAMPED",
"Type": "UNKNOWN",
"VirtualSensor": true,
"Hidden": true,
"Formula": "MINIMUM",
"Combination": ["55000", "VIRTUAL-SKIN-MODEL"],
"CombinationType": ["CONSTANT", "SENSOR"],
"Coefficient": [1.0, 1.0],
"Multiplier": 1
},
{
"Name": "VIRTUAL-SKIN-MODEL-CLAMPED",
"Type": "UNKNOWN",
"VirtualSensor": true,
"Hidden": true,
"Formula": "MAXIMUM",
"Combination": ["20000", "VIRTUAL-SKIN-MODEL-UPPER-CLAMPED"],
"CombinationType": ["CONSTANT", "SENSOR"],
"Coefficient": [1.0, 1.0],
"Multiplier": 1
},
{
"Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF",
@ -188,6 +209,50 @@
"Coefficient": [1.0, -1.0],
"Multiplier": 1
},
{
"Name": "VIRTUAL-SKIN-LEGACY-MODEL-DIFF",
"Type": "UNKNOWN",
"VirtualSensor": true,
"Hidden": true,
"Formula": "WEIGHTED_AVG",
"Combination": ["VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL"],
"Coefficient": [1.0, -1.0],
"Multiplier": 1
},
{
"Name": "VT_LEGACY_WEIGHT",
"Type": "UNKNOWN",
"Hidden": true,
"VirtualSensor": true,
"Formula": "COUNT_THRESHOLD",
"StepRatio": 0.2,
"Combination": ["VIRTUAL-SKIN-MODEL-LEGACY-DIFF", "VIRTUAL-SKIN-LEGACY-MODEL-DIFF"],
"Coefficient": [7000, 7000],
"Multiplier": 1,
"PassiveDelay": 7000
},
{
"Name": "VT_MODEL_WEIGHT",
"Type": "UNKNOWN",
"Hidden": true,
"VirtualSensor": true,
"Formula": "WEIGHTED_AVG",
"Combination": ["1", "VT_LEGACY_WEIGHT"],
"CombinationType": ["CONSTANT", "SENSOR"],
"Coefficient": [1.0, -1.0],
"Multiplier": 1
},
{
"Name": "VIRTUAL-SKIN-MODEL-UPDATED",
"Type": "UNKNOWN",
"VirtualSensor": true,
"Hidden": true,
"Formula": "WEIGHTED_AVG",
"Combination": ["VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-CLAMPED"],
"Coefficient": ["VT_LEGACY_WEIGHT", "VT_MODEL_WEIGHT"],
"CoefficientType": ["SENSOR", "SENSOR"],
"Multiplier": 1
},
{
"Name": "VIRTUAL-SKIN-LSTM-MODEL",
"Type": "UNKNOWN",
@ -222,7 +287,7 @@
"VirtualSensor": true,
"TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
"Formula": "MAXIMUM",
"Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY"],
"Combination": ["VIRTUAL-SKIN-MODEL-UPDATED", "VIRTUAL-SKIN-LEGACY"],
"Coefficient": [1.0, "VIRTUAL-SKIN-LEGACY-SHUTDOWN"],
"CoefficientType":["CONSTANT", "SENSOR"],
"HotThreshold": ["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0],

View file

@ -196,10 +196,31 @@
"Multiplier": 0.001,
"Offset": 500,
"PreviousSampleCount": 3,
"BackupSensor" : "VIRTUAL-SKIN-LEGACY",
"OffsetThresholds" : [50000, 53000],
"OffsetValues" : [500, 1000],
"ValidateInput": true
"SupportUnderSampling": true
},
{
"Name": "VIRTUAL-SKIN-MODEL-UPPER-CLAMPED",
"Type": "UNKNOWN",
"VirtualSensor": true,
"Hidden": true,
"Formula": "MINIMUM",
"Combination": ["55000", "VIRTUAL-SKIN-MODEL"],
"CombinationType": ["CONSTANT", "SENSOR"],
"Coefficient": [1.0, 1.0],
"Multiplier": 1
},
{
"Name": "VIRTUAL-SKIN-MODEL-CLAMPED",
"Type": "UNKNOWN",
"VirtualSensor": true,
"Hidden": true,
"Formula": "MAXIMUM",
"Combination": ["20000", "VIRTUAL-SKIN-MODEL-UPPER-CLAMPED"],
"CombinationType": ["CONSTANT", "SENSOR"],
"Coefficient": [1.0, 1.0],
"Multiplier": 1
},
{
"Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF",
@ -211,6 +232,50 @@
"Coefficient": [1.0, -1.0],
"Multiplier": 1
},
{
"Name": "VIRTUAL-SKIN-LEGACY-MODEL-DIFF",
"Type": "UNKNOWN",
"VirtualSensor": true,
"Hidden": true,
"Formula": "WEIGHTED_AVG",
"Combination": ["VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL"],
"Coefficient": [1.0, -1.0],
"Multiplier": 1
},
{
"Name": "VT_LEGACY_WEIGHT",
"Type": "UNKNOWN",
"Hidden": true,
"VirtualSensor": true,
"Formula": "COUNT_THRESHOLD",
"StepRatio": 0.2,
"Combination": ["VIRTUAL-SKIN-MODEL-LEGACY-DIFF", "VIRTUAL-SKIN-LEGACY-MODEL-DIFF"],
"Coefficient": [7000, 7000],
"Multiplier": 1,
"PassiveDelay": 7000
},
{
"Name": "VT_MODEL_WEIGHT",
"Type": "UNKNOWN",
"Hidden": true,
"VirtualSensor": true,
"Formula": "WEIGHTED_AVG",
"Combination": ["1", "VT_LEGACY_WEIGHT"],
"CombinationType": ["CONSTANT", "SENSOR"],
"Coefficient": [1.0, -1.0],
"Multiplier": 1
},
{
"Name": "VIRTUAL-SKIN-MODEL-UPDATED",
"Type": "UNKNOWN",
"VirtualSensor": true,
"Hidden": true,
"Formula": "WEIGHTED_AVG",
"Combination": ["VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-CLAMPED"],
"Coefficient": ["VT_LEGACY_WEIGHT", "VT_MODEL_WEIGHT"],
"CoefficientType": ["SENSOR", "SENSOR"],
"Multiplier": 1
},
{
"Name": "VIRTUAL-SKIN-LSTM-MODEL",
"Type": "UNKNOWN",
@ -245,7 +310,7 @@
"VirtualSensor": true,
"TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
"Formula": "MAXIMUM",
"Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY"],
"Combination": ["VIRTUAL-SKIN-MODEL-UPDATED", "VIRTUAL-SKIN-LEGACY"],
"Coefficient": [1.0, "VIRTUAL-SKIN-LEGACY-SHUTDOWN"],
"CoefficientType":["CONSTANT", "SENSOR"],
"HotThreshold": ["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0],

View file

@ -163,10 +163,31 @@
"Combination": ["battery", "btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"],
"Multiplier": 0.001,
"PreviousSampleCount": 3,
"BackupSensor" : "VIRTUAL-SKIN-LEGACY",
"OffsetThresholds" : [50000, 53000],
"OffsetValues" : [500, 1000],
"ValidateInput": true
"SupportUnderSampling": true
},
{
"Name": "VIRTUAL-SKIN-MODEL-UPPER-CLAMPED",
"Type": "UNKNOWN",
"VirtualSensor": true,
"Hidden": true,
"Formula": "MINIMUM",
"Combination": ["55000", "VIRTUAL-SKIN-MODEL"],
"CombinationType": ["CONSTANT", "SENSOR"],
"Coefficient": [1.0, 1.0],
"Multiplier": 1
},
{
"Name": "VIRTUAL-SKIN-MODEL-CLAMPED",
"Type": "UNKNOWN",
"VirtualSensor": true,
"Hidden": true,
"Formula": "MAXIMUM",
"Combination": ["20000", "VIRTUAL-SKIN-MODEL-UPPER-CLAMPED"],
"CombinationType": ["CONSTANT", "SENSOR"],
"Coefficient": [1.0, 1.0],
"Multiplier": 1
},
{
"Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF",
@ -178,6 +199,50 @@
"Coefficient": [1.0, -1.0],
"Multiplier": 1
},
{
"Name": "VIRTUAL-SKIN-LEGACY-MODEL-DIFF",
"Type": "UNKNOWN",
"VirtualSensor": true,
"Hidden": true,
"Formula": "WEIGHTED_AVG",
"Combination": ["VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL"],
"Coefficient": [1.0, -1.0],
"Multiplier": 1
},
{
"Name": "VT_LEGACY_WEIGHT",
"Type": "UNKNOWN",
"Hidden": true,
"VirtualSensor": true,
"Formula": "COUNT_THRESHOLD",
"StepRatio": 0.2,
"Combination": ["VIRTUAL-SKIN-MODEL-LEGACY-DIFF", "VIRTUAL-SKIN-LEGACY-MODEL-DIFF"],
"Coefficient": [7000, 7000],
"Multiplier": 1,
"PassiveDelay": 7000
},
{
"Name": "VT_MODEL_WEIGHT",
"Type": "UNKNOWN",
"Hidden": true,
"VirtualSensor": true,
"Formula": "WEIGHTED_AVG",
"Combination": ["1", "VT_LEGACY_WEIGHT"],
"CombinationType": ["CONSTANT", "SENSOR"],
"Coefficient": [1.0, -1.0],
"Multiplier": 1
},
{
"Name": "VIRTUAL-SKIN-MODEL-UPDATED",
"Type": "UNKNOWN",
"VirtualSensor": true,
"Hidden": true,
"Formula": "WEIGHTED_AVG",
"Combination": ["VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-CLAMPED"],
"Coefficient": ["VT_LEGACY_WEIGHT", "VT_MODEL_WEIGHT"],
"CoefficientType": ["SENSOR", "SENSOR"],
"Multiplier": 1
},
{
"Name": "VIRTUAL-SKIN-LSTM-MODEL",
"Type": "UNKNOWN",
@ -212,7 +277,7 @@
"VirtualSensor": true,
"TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
"Formula": "MAXIMUM",
"Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY"],
"Combination": ["VIRTUAL-SKIN-MODEL-UPDATED", "VIRTUAL-SKIN-LEGACY"],
"Coefficient": [1.0, "VIRTUAL-SKIN-LEGACY-SHUTDOWN"],
"CoefficientType":["CONSTANT", "SENSOR"],
"HotThreshold": ["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0],

17
tokay_generic.mk Normal file
View file

@ -0,0 +1,17 @@
#
# Copyright 2024 The Android Open-Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
$(call inherit-product, device/google/caimito/device-tokay.mk)