Snap for 13025264 from edfb16b6a0 to mainline-tzdata6-release

Change-Id: Ia7f6a6054e56cbe20c4e93f2ba2736c04675fbb2
This commit is contained in:
Android Build Coastguard Worker 2025-02-06 14:20:07 -08:00
commit 08b68a34bd
41 changed files with 566 additions and 628 deletions

View file

@ -27,6 +27,3 @@ PRODUCT_DEVICE := caiman
PRODUCT_MODEL := AOSP on caiman PRODUCT_MODEL := AOSP on caiman
PRODUCT_BRAND := Android PRODUCT_BRAND := Android
PRODUCT_MANUFACTURER := Google PRODUCT_MANUFACTURER := Google
DEVICE_MANIFEST_FILE := \
device/google/caimito/manifest.xml

View file

@ -27,6 +27,3 @@ PRODUCT_DEVICE := komodo
PRODUCT_MODEL := AOSP on komodo PRODUCT_MODEL := AOSP on komodo
PRODUCT_BRAND := Android PRODUCT_BRAND := Android
PRODUCT_MANUFACTURER := Google PRODUCT_MANUFACTURER := Google
DEVICE_MANIFEST_FILE := \
device/google/caimito/manifest.xml

View file

@ -27,6 +27,3 @@ PRODUCT_DEVICE := ripcurrent24
PRODUCT_MODEL := AOSP on ripcurrent24 PRODUCT_MODEL := AOSP on ripcurrent24
PRODUCT_BRAND := Android PRODUCT_BRAND := Android
PRODUCT_MANUFACTURER := Google PRODUCT_MANUFACTURER := Google
DEVICE_MANIFEST_FILE := \
device/google/caimito/manifest.xml

View file

@ -27,6 +27,3 @@ PRODUCT_DEVICE := ripcurrentpro
PRODUCT_MODEL := AOSP on ripcurrentpro PRODUCT_MODEL := AOSP on ripcurrentpro
PRODUCT_BRAND := Android PRODUCT_BRAND := Android
PRODUCT_MANUFACTURER := Google PRODUCT_MANUFACTURER := Google
DEVICE_MANIFEST_FILE := \
device/google/caimito/manifest.xml

View file

@ -27,6 +27,3 @@ PRODUCT_DEVICE := tokay
PRODUCT_MODEL := AOSP on tokay PRODUCT_MODEL := AOSP on tokay
PRODUCT_BRAND := Android PRODUCT_BRAND := Android
PRODUCT_MANUFACTURER := Google PRODUCT_MANUFACTURER := Google
DEVICE_MANIFEST_FILE := \
device/google/caimito/manifest.xml

View file

@ -168,6 +168,9 @@
<!-- Type of the quick pickup sensor. Empty if quick pickup is not supported. --> <!-- Type of the quick pickup sensor. Empty if quick pickup is not supported. -->
<string name="config_quickPickupSensorType" translatable="false">com.google.sensor.quick_pickup</string> <string name="config_quickPickupSensorType" translatable="false">com.google.sensor.quick_pickup</string>
<!-- If AOD can show an ambient version of the wallpaper -->
<bool name="config_dozeSupportsAodWallpaper">true</bool>
<!-- The stable device width and height in pixels. If these aren't set to a positive number <!-- The stable device width and height in pixels. If these aren't set to a positive number
then the device will use the width and height of the default display the first time it's then the device will use the width and height of the default display the first time it's
booted. --> booted. -->
@ -227,4 +230,11 @@
<!-- Package name providing GNSS location support. Used only when <!-- Package name providing GNSS location support. Used only when
config_useGnssHardwareProvider is false. --> config_useGnssHardwareProvider is false. -->
<string name="config_gnssLocationProviderPackageName" translatable="false">com.google.android.gms</string> <string name="config_gnssLocationProviderPackageName" translatable="false">com.google.android.gms</string>
<!-- Whether to enable fp unlock when screen turns off on udfps devices -->
<bool name="config_screen_off_udfps_enabled">true</bool>
<!-- Default value for fp screen off unlock toggle, it only works for the devices that support
fp screen off unlock-->
<bool name="config_screen_off_udfps_default_on">false</bool>
</resources> </resources>

View file

@ -25,6 +25,8 @@
Values should be ISO3166 country codes in lowercase. --> Values should be ISO3166 country codes in lowercase. -->
<string-array name="config_countries_dynamic_routing_emergency_enabled" <string-array name="config_countries_dynamic_routing_emergency_enabled"
translatable="false"> translatable="false">
<!-- b/393518741 -->
<item>cz</item>
<item>in</item> <item>in</item>
<item>il</item> <item>il</item>
<item>tw</item> <item>tw</item>
@ -40,6 +42,9 @@
Values are the tuples of Country ISO, MNC, and numbers. --> Values are the tuples of Country ISO, MNC, and numbers. -->
<string-array name="config_dynamic_routing_emergency_numbers" <string-array name="config_dynamic_routing_emergency_numbers"
translatable="false"> translatable="false">
<!-- b/393518741 -->
<item>cz,01,156</item>
<item>cz,03,156</item>
<item>in,,101,102,103,108</item> <item>in,,101,102,103,108</item>
<item>il,,101,102</item> <item>il,,101,102</item>
<item>tw,,110,119</item> <item>tw,,110,119</item>

View file

@ -16,3 +16,11 @@ runtime_resource_overlay {
sdk_version: "current", sdk_version: "current",
product_specific: true, product_specific: true,
} }
runtime_resource_overlay {
name: "UwbOverlayCM4Gsi",
theme: "UwbOverlayCM4",
certificate: "platform",
sdk_version: "current",
vendor: true,
}

View file

@ -40,8 +40,6 @@ ifneq ($(TARGET_BOOTS_16K),true)
PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_CAIMAN_16K_DEVELOPER_OPTION) PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_CAIMAN_16K_DEVELOPER_OPTION)
endif endif
include device/google/caimito/device-caimito-16k-common.mk
else else
TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1 TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1
TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers
@ -298,7 +296,8 @@ PRODUCT_SOONG_NAMESPACES += \
# UWB Overlay # UWB Overlay
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
UwbOverlayCM4 UwbOverlayCM4 \
UwbOverlayCM4Gsi
# WiFi Overlay # WiFi Overlay
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
@ -389,8 +388,7 @@ PRODUCT_VENDOR_PROPERTIES += \
persist.vendor.vibrator.hal.context.scale=60 \ persist.vendor.vibrator.hal.context.scale=60 \
persist.vendor.vibrator.hal.context.fade=true \ persist.vendor.vibrator.hal.context.fade=true \
persist.vendor.vibrator.hal.context.cooldowntime=1600 \ persist.vendor.vibrator.hal.context.cooldowntime=1600 \
persist.vendor.vibrator.hal.context.settlingtime=5000 \ persist.vendor.vibrator.hal.context.settlingtime=5000
ro.vendor.vibrator.hal.pm.activetimeout=5
# Override Output Distortion Gain # Override Output Distortion Gain
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \

View file

@ -1,54 +0,0 @@
#
# Copyright (C) 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.
#
ifneq ($(wildcard $(TARGET_KERNEL_DIR)/16kb/),)
ifeq ($(TARGET_BOOTS_16K),true)
# Configures the 16kb kernel directory.
TARGET_KERNEL_DIR := $(TARGET_KERNEL_DIR)/16kb
else ifeq ($(PRODUCT_16K_DEVELOPER_OPTION),true)
# Configures the 16kb kernel and modules for OTA updates.
TARGET_KERNEL_DIR_16K := $(TARGET_KERNEL_DIR)/16kb
BOARD_KERNEL_PATH_16K := $(TARGET_KERNEL_DIR_16K)/Image.lz4
BOARD_KERNEL_MODULES_16K += $(file < $(TARGET_KERNEL_DIR_16K)/vendor_kernel_boot.modules.load)
BOARD_KERNEL_MODULES_16K += $(file < $(TARGET_KERNEL_DIR_16K)/system_dlkm.modules.load)
BOARD_KERNEL_MODULES_16K += $(file < $(TARGET_KERNEL_DIR_16K)/vendor_dlkm.modules.load)
BOARD_KERNEL_MODULES_16K := $(foreach module,$(BOARD_KERNEL_MODULES_16K),$(TARGET_KERNEL_DIR_16K)/$(notdir $(module)))
BOARD_PREBUILT_DTBOIMAGE_16KB := $(TARGET_KERNEL_DIR_16K)/dtbo.img
# The 16kb mode does not use these modules.
BOARD_KERNEL_MODULES_16K := $(filter-out %/bcm_dbg.ko,$(BOARD_KERNEL_MODULES_16K))
BOARD_KERNEL_MODULES_16K := $(filter-out %/zram.ko,$(BOARD_KERNEL_MODULES_16K))
BOARD_KERNEL_MODULES_16K := $(filter-out %/aoc_unit_test_dev.ko,$(BOARD_KERNEL_MODULES_16K))
BOARD_KERNEL_MODULES_16K := $(filter-out %/gs-panel-common-test.ko,$(BOARD_KERNEL_MODULES_16K))
BOARD_KERNEL_MODULES_16K := $(filter-out %/mali_kutf.ko,$(BOARD_KERNEL_MODULES_16K))
BOARD_KERNEL_MODULES_16K := $(filter-out %/mali_kutf_clk_rate_trace_test_portal.ko,$(BOARD_KERNEL_MODULES_16K))
BOARD_KERNEL_MODULES_16K := $(filter-out %/panel-gs-tk4c-test.ko,$(BOARD_KERNEL_MODULES_16K))
BOARD_KERNEL_MODULES_16K := $(filter-out %/pwm-exynos.ko,$(BOARD_KERNEL_MODULES_16K))
BOARD_KERNEL_MODULES_16K := $(filter-out %/rt4539_bl.ko,$(BOARD_KERNEL_MODULES_16K))
BOARD_KERNEL_MODULES_16K := $(filter-out %/sec_touch.ko,$(BOARD_KERNEL_MODULES_16K))
BOARD_KERNEL_MODULES_16K := $(filter-out %/sscoredump_sample_test.ko,$(BOARD_KERNEL_MODULES_16K))
BOARD_KERNEL_MODULES_16K := $(filter-out %/sscoredump_test.ko,$(BOARD_KERNEL_MODULES_16K))
BOARD_KERNEL_MODULES_LOAD_16K := $(foreach module,$(BOARD_KERNEL_MODULES_16K),$(notdir $(module)))
BOARD_16K_OTA_USE_INCREMENTAL := true
BOARD_16K_OTA_MOVE_VENDOR := true
endif
endif

View file

@ -27,6 +27,7 @@ PRODUCT_COPY_FILES += \
ifneq (,$(filter $(TARGET_DEVICE),komodo caiman tokay)) ifneq (,$(filter $(TARGET_DEVICE),komodo caiman tokay))
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/thermal_info_config_$(TARGET_DEVICE)_proto.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_proto.json \ $(TARGET_VENDOR_THERMAL_CONFIG_PATH)/thermal_info_config_$(TARGET_DEVICE)_proto.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_proto.json \
$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/thermal_info_config_lpm_$(TARGET_DEVICE).json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_lpm.json \
$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/vt_estimation_model_$(TARGET_DEVICE).tflite:$(TARGET_COPY_OUT_VENDOR)/etc/vt_estimation_model.tflite \ $(TARGET_VENDOR_THERMAL_CONFIG_PATH)/vt_estimation_model_$(TARGET_DEVICE).tflite:$(TARGET_COPY_OUT_VENDOR)/etc/vt_estimation_model.tflite \
$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/vt_prediction_lstm_model_$(TARGET_DEVICE).tflite:$(TARGET_COPY_OUT_VENDOR)/etc/vt_prediction_lstm_model.tflite $(TARGET_VENDOR_THERMAL_CONFIG_PATH)/vt_prediction_lstm_model_$(TARGET_DEVICE).tflite:$(TARGET_COPY_OUT_VENDOR)/etc/vt_prediction_lstm_model.tflite
ifneq (,$(filter $(TARGET_BUILD_VARIANT), userdebug eng)) ifneq (,$(filter $(TARGET_BUILD_VARIANT), userdebug eng))

View file

@ -40,8 +40,6 @@ ifneq ($(TARGET_BOOTS_16K),true)
PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_KOMODO_16K_DEVELOPER_OPTION) PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_KOMODO_16K_DEVELOPER_OPTION)
endif endif
include device/google/caimito/device-caimito-16k-common.mk
else else
TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1 TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1
TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers
@ -318,7 +316,8 @@ PRODUCT_SOONG_NAMESPACES += \
# UWB Overlay # UWB Overlay
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
UwbOverlayKM4 UwbOverlayKM4 \
UwbOverlayKM4Gsi
# WiFi Overlay # WiFi Overlay
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
@ -390,8 +389,7 @@ PRODUCT_VENDOR_PROPERTIES += \
persist.vendor.vibrator.hal.context.scale=60 \ persist.vendor.vibrator.hal.context.scale=60 \
persist.vendor.vibrator.hal.context.fade=true \ persist.vendor.vibrator.hal.context.fade=true \
persist.vendor.vibrator.hal.context.cooldowntime=1600 \ persist.vendor.vibrator.hal.context.cooldowntime=1600 \
persist.vendor.vibrator.hal.context.settlingtime=5000 \ persist.vendor.vibrator.hal.context.settlingtime=5000
ro.vendor.vibrator.hal.pm.activetimeout=5
# Override Output Distortion Gain # Override Output Distortion Gain
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \

View file

@ -40,8 +40,6 @@ ifneq ($(TARGET_BOOTS_16K),true)
PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_TOKAY_16K_DEVELOPER_OPTION) PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_TOKAY_16K_DEVELOPER_OPTION)
endif endif
include device/google/caimito/device-caimito-16k-common.mk
else else
TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1 TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1
TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers
@ -355,8 +353,7 @@ PRODUCT_VENDOR_PROPERTIES += \
persist.vendor.vibrator.hal.context.scale=60 \ persist.vendor.vibrator.hal.context.scale=60 \
persist.vendor.vibrator.hal.context.fade=true \ persist.vendor.vibrator.hal.context.fade=true \
persist.vendor.vibrator.hal.context.cooldowntime=1600 \ persist.vendor.vibrator.hal.context.cooldowntime=1600 \
persist.vendor.vibrator.hal.context.settlingtime=5000 \ persist.vendor.vibrator.hal.context.settlingtime=5000
ro.vendor.vibrator.hal.pm.activetimeout=5
# Override Output Distortion Gain # Override Output Distortion Gain
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \

View file

@ -6,6 +6,13 @@
<instance>default</instance> <instance>default</instance>
</interface> </interface>
</hal> </hal>
<hal format="aidl" optional="true">
<name>com.google.hardware.biometrics.fingerprint.debug</name>
<interface>
<name>IFingerprintDebug</name>
<instance>default</instance>
</interface>
</hal>
<hal format="aidl" optional="true"> <hal format="aidl" optional="true">
<name>vendor.qti.hardware.fingerprint</name> <name>vendor.qti.hardware.fingerprint</name>
<version>1</version> <version>1</version>

View file

@ -33,6 +33,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
log.tag.QFP=3 log.tag.QFP=3
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
$(call soong_config_set,fp_hal_feature,fingerprint_debug_support,$(RELEASE_PIXEL_AIDL_FINGERPRINT_DEBUG_HAL))
PRODUCT_SOONG_NAMESPACES += \ PRODUCT_SOONG_NAMESPACES += \
vendor/qcom/fingerprint/QFPCalibration vendor/qcom/fingerprint/QFPCalibration

View file

@ -168,6 +168,9 @@
<!-- Type of the quick pickup sensor. Empty if quick pickup is not supported. --> <!-- Type of the quick pickup sensor. Empty if quick pickup is not supported. -->
<string name="config_quickPickupSensorType" translatable="false">com.google.sensor.quick_pickup</string> <string name="config_quickPickupSensorType" translatable="false">com.google.sensor.quick_pickup</string>
<!-- If AOD can show an ambient version of the wallpaper -->
<bool name="config_dozeSupportsAodWallpaper">true</bool>
<!-- The stable device width and height in pixels. If these aren't set to a positive number <!-- The stable device width and height in pixels. If these aren't set to a positive number
then the device will use the width and height of the default display the first time it's then the device will use the width and height of the default display the first time it's
booted. --> booted. -->
@ -227,4 +230,11 @@
<!-- Package name providing GNSS location support. Used only when <!-- Package name providing GNSS location support. Used only when
config_useGnssHardwareProvider is false. --> config_useGnssHardwareProvider is false. -->
<string name="config_gnssLocationProviderPackageName" translatable="false">com.google.android.gms</string> <string name="config_gnssLocationProviderPackageName" translatable="false">com.google.android.gms</string>
<!-- Whether to enable fp unlock when screen turns off on udfps devices -->
<bool name="config_screen_off_udfps_enabled">true</bool>
<!-- Default value for fp screen off unlock toggle, it only works for the devices that support
fp screen off unlock-->
<bool name="config_screen_off_udfps_default_on">false</bool>
</resources> </resources>

View file

@ -25,6 +25,8 @@
Values should be ISO3166 country codes in lowercase. --> Values should be ISO3166 country codes in lowercase. -->
<string-array name="config_countries_dynamic_routing_emergency_enabled" <string-array name="config_countries_dynamic_routing_emergency_enabled"
translatable="false"> translatable="false">
<!-- b/393518741 -->
<item>cz</item>
<item>in</item> <item>in</item>
<item>il</item> <item>il</item>
<item>tw</item> <item>tw</item>
@ -40,6 +42,9 @@
Values are the tuples of Country ISO, MNC, and numbers. --> Values are the tuples of Country ISO, MNC, and numbers. -->
<string-array name="config_dynamic_routing_emergency_numbers" <string-array name="config_dynamic_routing_emergency_numbers"
translatable="false"> translatable="false">
<!-- b/393518741 -->
<item>cz,01,156</item>
<item>cz,03,156</item>
<item>in,,101,102,103,108</item> <item>in,,101,102,103,108</item>
<item>il,,101,102</item> <item>il,,101,102</item>
<item>tw,,110,119</item> <item>tw,,110,119</item>

View file

@ -14,5 +14,13 @@ runtime_resource_overlay {
theme: "UwbOverlayKM4", theme: "UwbOverlayKM4",
certificate: "platform", certificate: "platform",
sdk_version: "current", sdk_version: "current",
product_specific: true product_specific: true,
}
runtime_resource_overlay {
name: "UwbOverlayKM4Gsi",
theme: "UwbOverlayKM4",
certificate: "platform",
sdk_version: "current",
vendor: true,
} }

View file

@ -162,10 +162,14 @@ ENABLE_LPP_UP=1
ENABLE_LPPE_UP=3 ENABLE_LPPE_UP=3
GNSS_CARRIER_ID=6 GNSS_CARRIER_ID=6
ENABLE_CAPS_OTDOA=0
ENABLE_LPP_CP=0 ENABLE_LPP_CP=0
ENABLE_LPP_UP=1 ENABLE_LPP_UP=1
ENABLE_LPPE_CP=0 ENABLE_LPPE_CP=0
ENABLE_LPPE_UP=3 ENABLE_LPPE_UP=3
ENABLE_2G_UP_CAPS_MSA=0
ENABLE_3G_UP_CAPS_MSA=0
ENABLE_4G_UP_CAPS_MSA=0
GNSS_CARRIER_ID=7 GNSS_CARRIER_ID=7
ENABLE_LPP_CP=0 ENABLE_LPP_CP=0

View file

@ -335,10 +335,14 @@ ENABLE_LPP_UP=1
ENABLE_LPPE_UP=3 ENABLE_LPPE_UP=3
# KDDI # KDDI
GNSS_CARRIER_ID=6 GNSS_CARRIER_ID=6
ENABLE_CAPS_OTDOA=0
ENABLE_LPP_CP=0 ENABLE_LPP_CP=0
ENABLE_LPP_UP=1 ENABLE_LPP_UP=1
ENABLE_LPPE_CP=0 ENABLE_LPPE_CP=0
ENABLE_LPPE_UP=3 ENABLE_LPPE_UP=3
ENABLE_2G_UP_CAPS_MSA=0
ENABLE_3G_UP_CAPS_MSA=0
ENABLE_4G_UP_CAPS_MSA=0
# SBM # SBM
GNSS_CARRIER_ID=7 GNSS_CARRIER_ID=7
ENABLE_LPP_CP=0 ENABLE_LPP_CP=0

View file

@ -162,10 +162,14 @@ ENABLE_LPP_UP=1
ENABLE_LPPE_UP=3 ENABLE_LPPE_UP=3
GNSS_CARRIER_ID=6 GNSS_CARRIER_ID=6
ENABLE_CAPS_OTDOA=0
ENABLE_LPP_CP=0 ENABLE_LPP_CP=0
ENABLE_LPP_UP=1 ENABLE_LPP_UP=1
ENABLE_LPPE_CP=0 ENABLE_LPPE_CP=0
ENABLE_LPPE_UP=3 ENABLE_LPPE_UP=3
ENABLE_2G_UP_CAPS_MSA=0
ENABLE_3G_UP_CAPS_MSA=0
ENABLE_4G_UP_CAPS_MSA=0
GNSS_CARRIER_ID=7 GNSS_CARRIER_ID=7
ENABLE_LPP_CP=0 ENABLE_LPP_CP=0

View file

@ -335,10 +335,14 @@ ENABLE_LPP_UP=1
ENABLE_LPPE_UP=3 ENABLE_LPPE_UP=3
# KDDI # KDDI
GNSS_CARRIER_ID=6 GNSS_CARRIER_ID=6
ENABLE_CAPS_OTDOA=0
ENABLE_LPP_CP=0 ENABLE_LPP_CP=0
ENABLE_LPP_UP=1 ENABLE_LPP_UP=1
ENABLE_LPPE_CP=0 ENABLE_LPPE_CP=0
ENABLE_LPPE_UP=3 ENABLE_LPPE_UP=3
ENABLE_2G_UP_CAPS_MSA=0
ENABLE_3G_UP_CAPS_MSA=0
ENABLE_4G_UP_CAPS_MSA=0
# SBM # SBM
GNSS_CARRIER_ID=7 GNSS_CARRIER_ID=7
ENABLE_LPP_CP=0 ENABLE_LPP_CP=0

View file

@ -154,10 +154,14 @@ ENABLE_LPP_UP=1
ENABLE_LPPE_UP=3 ENABLE_LPPE_UP=3
GNSS_CARRIER_ID=6 GNSS_CARRIER_ID=6
ENABLE_CAPS_OTDOA=0
ENABLE_LPP_CP=0 ENABLE_LPP_CP=0
ENABLE_LPP_UP=1 ENABLE_LPP_UP=1
ENABLE_LPPE_CP=0 ENABLE_LPPE_CP=0
ENABLE_LPPE_UP=3 ENABLE_LPPE_UP=3
ENABLE_2G_UP_CAPS_MSA=0
ENABLE_3G_UP_CAPS_MSA=0
ENABLE_4G_UP_CAPS_MSA=0
GNSS_CARRIER_ID=7 GNSS_CARRIER_ID=7
ENABLE_LPP_CP=0 ENABLE_LPP_CP=0

View file

@ -326,10 +326,14 @@ ENABLE_LPP_UP=1
ENABLE_LPPE_UP=3 ENABLE_LPPE_UP=3
# KDDI # KDDI
GNSS_CARRIER_ID=6 GNSS_CARRIER_ID=6
ENABLE_CAPS_OTDOA=0
ENABLE_LPP_CP=0 ENABLE_LPP_CP=0
ENABLE_LPP_UP=1 ENABLE_LPP_UP=1
ENABLE_LPPE_CP=0 ENABLE_LPPE_CP=0
ENABLE_LPPE_UP=3 ENABLE_LPPE_UP=3
ENABLE_2G_UP_CAPS_MSA=0
ENABLE_3G_UP_CAPS_MSA=0
ENABLE_4G_UP_CAPS_MSA=0
# SBM # SBM
GNSS_CARRIER_ID=7 GNSS_CARRIER_ID=7
ENABLE_LPP_CP=0 ENABLE_LPP_CP=0

View file

@ -154,10 +154,14 @@ ENABLE_LPP_UP=1
ENABLE_LPPE_UP=3 ENABLE_LPPE_UP=3
GNSS_CARRIER_ID=6 GNSS_CARRIER_ID=6
ENABLE_CAPS_OTDOA=0
ENABLE_LPP_CP=0 ENABLE_LPP_CP=0
ENABLE_LPP_UP=1 ENABLE_LPP_UP=1
ENABLE_LPPE_CP=0 ENABLE_LPPE_CP=0
ENABLE_LPPE_UP=3 ENABLE_LPPE_UP=3
ENABLE_2G_UP_CAPS_MSA=0
ENABLE_3G_UP_CAPS_MSA=0
ENABLE_4G_UP_CAPS_MSA=0
GNSS_CARRIER_ID=7 GNSS_CARRIER_ID=7
ENABLE_LPP_CP=0 ENABLE_LPP_CP=0

View file

@ -326,10 +326,14 @@ ENABLE_LPP_UP=1
ENABLE_LPPE_UP=3 ENABLE_LPPE_UP=3
# KDDI # KDDI
GNSS_CARRIER_ID=6 GNSS_CARRIER_ID=6
ENABLE_CAPS_OTDOA=0
ENABLE_LPP_CP=0 ENABLE_LPP_CP=0
ENABLE_LPP_UP=1 ENABLE_LPP_UP=1
ENABLE_LPPE_CP=0 ENABLE_LPPE_CP=0
ENABLE_LPPE_UP=3 ENABLE_LPPE_UP=3
ENABLE_2G_UP_CAPS_MSA=0
ENABLE_3G_UP_CAPS_MSA=0
ENABLE_4G_UP_CAPS_MSA=0
# SBM # SBM
GNSS_CARRIER_ID=7 GNSS_CARRIER_ID=7
ENABLE_LPP_CP=0 ENABLE_LPP_CP=0

View file

@ -162,10 +162,14 @@ ENABLE_LPP_UP=1
ENABLE_LPPE_UP=3 ENABLE_LPPE_UP=3
GNSS_CARRIER_ID=6 GNSS_CARRIER_ID=6
ENABLE_CAPS_OTDOA=0
ENABLE_LPP_CP=0 ENABLE_LPP_CP=0
ENABLE_LPP_UP=1 ENABLE_LPP_UP=1
ENABLE_LPPE_CP=0 ENABLE_LPPE_CP=0
ENABLE_LPPE_UP=3 ENABLE_LPPE_UP=3
ENABLE_2G_UP_CAPS_MSA=0
ENABLE_3G_UP_CAPS_MSA=0
ENABLE_4G_UP_CAPS_MSA=0
GNSS_CARRIER_ID=7 GNSS_CARRIER_ID=7
ENABLE_LPP_CP=0 ENABLE_LPP_CP=0

View file

@ -335,10 +335,14 @@ ENABLE_LPP_UP=1
ENABLE_LPPE_UP=3 ENABLE_LPPE_UP=3
# KDDI # KDDI
GNSS_CARRIER_ID=6 GNSS_CARRIER_ID=6
ENABLE_CAPS_OTDOA=0
ENABLE_LPP_CP=0 ENABLE_LPP_CP=0
ENABLE_LPP_UP=1 ENABLE_LPP_UP=1
ENABLE_LPPE_CP=0 ENABLE_LPPE_CP=0
ENABLE_LPPE_UP=3 ENABLE_LPPE_UP=3
ENABLE_2G_UP_CAPS_MSA=0
ENABLE_3G_UP_CAPS_MSA=0
ENABLE_4G_UP_CAPS_MSA=0
# SBM # SBM
GNSS_CARRIER_ID=7 GNSS_CARRIER_ID=7
ENABLE_LPP_CP=0 ENABLE_LPP_CP=0

View file

@ -1,116 +0,0 @@
<manifest version="1.0" type="device" target-level="5">
<hal format="hidl">
<name>android.hardware.audio</name>
<transport>hwbinder</transport>
<version>7.1</version>
<interface>
<name>IDevicesFactory</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>android.hardware.audio.effect</name>
<transport>hwbinder</transport>
<version>7.0</version>
<interface>
<name>IEffectsFactory</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>android.hardware.soundtrigger</name>
<transport>hwbinder</transport>
<version>2.3</version>
<interface>
<name>ISoundTriggerHw</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>android.hardware.media.omx</name>
<transport>hwbinder</transport>
<version>1.0</version>
<interface>
<name>IOmx</name>
<instance>default</instance>
</interface>
<interface>
<name>IOmxStore</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>android.hardware.graphics.allocator</name>
<transport>hwbinder</transport>
<version>4.0</version>
<interface>
<name>IAllocator</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>android.hardware.graphics.composer</name>
<transport>hwbinder</transport>
<version>2.4</version>
<interface>
<name>IComposer</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>android.hardware.renderscript</name>
<transport arch="32+64">passthrough</transport>
<version>1.0</version>
<interface>
<name>IDevice</name>
<instance>default</instance>
</interface>
</hal>
<hal format = "hidl">
<name>android.hardware.dumpstate</name>
<transport>hwbinder</transport>
<version>1.1</version>
<interface>
<name>IDumpstateDevice</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>android.hardware.bluetooth.audio</name>
<transport>hwbinder</transport>
<version>2.1</version>
<interface>
<name>IBluetoothAudioProvidersFactory</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>android.hardware.boot</name>
<transport>hwbinder</transport>
<fqname>@1.2::IBootControl/default</fqname>
</hal>
<hal format="hidl">
<name>android.hardware.neuralnetworks</name>
<transport>hwbinder</transport>
<fqname>@1.3::IDevice/google-edgetpu</fqname>
</hal>
<hal format="hidl">
<name>android.hardware.health</name>
<transport>hwbinder</transport>
<version>2.1</version>
<interface>
<name>IHealth</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>vendor.google.whitechapel.audio.audioext</name>
<transport>hwbinder</transport>
<version>4.0</version>
<interface>
<name>IAudioExt</name>
<instance>default</instance>
</interface>
</hal>
<kernel target-level="6"/>
</manifest>

View file

@ -888,6 +888,26 @@
"ResetOnInit": true, "ResetOnInit": true,
"Type": "Property" "Type": "Property"
}, },
{
"Name": "ntc_critical_trip",
"Path": "/dev/thermal/tz-by-name/quiet_therm/trip_point_1_temp",
"Values": [
"60000",
"70000"
],
"DefaultIndex": 0,
"ResetOnInit": true
},
{
"Name": "ntc_hot_trip",
"Path": "/dev/thermal/tz-by-name/quiet_therm/trip_point_2_temp",
"Values": [
"65000",
"75000"
],
"DefaultIndex": 0,
"ResetOnInit": true
},
{ {
"Name": "MIFTargetLoad", "Name": "MIFTargetLoad",
"Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load",
@ -993,6 +1013,16 @@
"WriteOnly": true, "WriteOnly": true,
"ResetOnInit": false "ResetOnInit": false
}, },
{
"Name": "AAModeProperty",
"Path": "vendor.powerhal.mode.aa",
"Values": [
"1",
"0"
],
"ResetOnInit": true,
"Type": "Property"
},
{ {
"Name": "KswapdUclaimMin", "Name": "KswapdUclaimMin",
"Path": "/sys/kernel/vendor_mm/kswapd_uclamp_min", "Path": "/sys/kernel/vendor_mm/kswapd_uclamp_min",
@ -3213,6 +3243,12 @@
"Duration": 0, "Duration": 0,
"Value": "1" "Value": "1"
}, },
{
"PowerHint": "AUTOMOTIVE_PROJECTION",
"Node": "AAModeProperty",
"Duration": 0,
"Value": "1"
},
{ {
"PowerHint": "DISPLAY_IDLE", "PowerHint": "DISPLAY_IDLE",
"Node": "FGPreferIdle", "Node": "FGPreferIdle",
@ -3254,6 +3290,18 @@
"Duration": 0, "Duration": 0,
"Value": "170" "Value": "170"
}, },
{
"PowerHint": "DISPLAY_IDLE",
"Type": "MaskHint",
"Value":"DISPLAY_UPDATE_IMMINENT",
"EnableProperty": "vendor.powerhal.mode.aa"
},
{
"PowerHint": "DISPLAY_IDLE",
"Type": "MaskHint",
"Value":"CPU_LOAD_RESET",
"EnableProperty": "vendor.powerhal.mode.aa"
},
{ {
"PowerHint": "DISPLAY_UPDATE_IMMINENT", "PowerHint": "DISPLAY_UPDATE_IMMINENT",
"Node": "CPULittleClusterDownRateLimitUs", "Node": "CPULittleClusterDownRateLimitUs",
@ -3398,6 +3446,18 @@
"Duration": 0, "Duration": 0,
"Value": "1" "Value": "1"
}, },
{
"PowerHint": "THERMAL_ShutdownMode_EMERGENCY",
"Node": "ntc_critical_trip",
"Duration": 0,
"Value": "70000"
},
{
"PowerHint": "THERMAL_ShutdownMode_EMERGENCY",
"Node": "ntc_hot_trip",
"Duration": 0,
"Value": "75000"
},
{ {
"PowerHint": "GAME", "PowerHint": "GAME",
"Node": "PMU_POLL", "Node": "PMU_POLL",

View file

@ -888,6 +888,26 @@
"ResetOnInit": true, "ResetOnInit": true,
"Type": "Property" "Type": "Property"
}, },
{
"Name": "ntc_critical_trip",
"Path": "/dev/thermal/tz-by-name/quiet_therm/trip_point_1_temp",
"Values": [
"60000",
"70000"
],
"DefaultIndex": 0,
"ResetOnInit": true
},
{
"Name": "ntc_hot_trip",
"Path": "/dev/thermal/tz-by-name/quiet_therm/trip_point_2_temp",
"Values": [
"65000",
"75000"
],
"DefaultIndex": 0,
"ResetOnInit": true
},
{ {
"Name": "MIFTargetLoad", "Name": "MIFTargetLoad",
"Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load",
@ -993,6 +1013,16 @@
"WriteOnly": true, "WriteOnly": true,
"ResetOnInit": false "ResetOnInit": false
}, },
{
"Name": "AAModeProperty",
"Path": "vendor.powerhal.mode.aa",
"Values": [
"1",
"0"
],
"ResetOnInit": true,
"Type": "Property"
},
{ {
"Name": "KswapdUclaimMin", "Name": "KswapdUclaimMin",
"Path": "/sys/kernel/vendor_mm/kswapd_uclamp_min", "Path": "/sys/kernel/vendor_mm/kswapd_uclamp_min",
@ -3213,6 +3243,12 @@
"Duration": 0, "Duration": 0,
"Value": "1" "Value": "1"
}, },
{
"PowerHint": "AUTOMOTIVE_PROJECTION",
"Node": "AAModeProperty",
"Duration": 0,
"Value": "1"
},
{ {
"PowerHint": "DISPLAY_IDLE", "PowerHint": "DISPLAY_IDLE",
"Node": "FGPreferIdle", "Node": "FGPreferIdle",
@ -3254,6 +3290,18 @@
"Duration": 0, "Duration": 0,
"Value": "170" "Value": "170"
}, },
{
"PowerHint": "DISPLAY_IDLE",
"Type": "MaskHint",
"Value":"DISPLAY_UPDATE_IMMINENT",
"EnableProperty": "vendor.powerhal.mode.aa"
},
{
"PowerHint": "DISPLAY_IDLE",
"Type": "MaskHint",
"Value":"CPU_LOAD_RESET",
"EnableProperty": "vendor.powerhal.mode.aa"
},
{ {
"PowerHint": "DISPLAY_UPDATE_IMMINENT", "PowerHint": "DISPLAY_UPDATE_IMMINENT",
"Node": "CPULittleClusterDownRateLimitUs", "Node": "CPULittleClusterDownRateLimitUs",
@ -3398,6 +3446,18 @@
"Duration": 0, "Duration": 0,
"Value": "1" "Value": "1"
}, },
{
"PowerHint": "THERMAL_ShutdownMode_EMERGENCY",
"Node": "ntc_critical_trip",
"Duration": 0,
"Value": "70000"
},
{
"PowerHint": "THERMAL_ShutdownMode_EMERGENCY",
"Node": "ntc_hot_trip",
"Duration": 0,
"Value": "75000"
},
{ {
"PowerHint": "GAME", "PowerHint": "GAME",
"Node": "PMU_POLL", "Node": "PMU_POLL",

View file

@ -888,6 +888,26 @@
"ResetOnInit": true, "ResetOnInit": true,
"Type": "Property" "Type": "Property"
}, },
{
"Name": "ntc_critical_trip",
"Path": "/dev/thermal/tz-by-name/quiet_therm/trip_point_1_temp",
"Values": [
"60000",
"70000"
],
"DefaultIndex": 0,
"ResetOnInit": true
},
{
"Name": "ntc_hot_trip",
"Path": "/dev/thermal/tz-by-name/quiet_therm/trip_point_2_temp",
"Values": [
"65000",
"75000"
],
"DefaultIndex": 0,
"ResetOnInit": true
},
{ {
"Name": "MIFTargetLoad", "Name": "MIFTargetLoad",
"Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load",
@ -993,6 +1013,16 @@
"WriteOnly": true, "WriteOnly": true,
"ResetOnInit": false "ResetOnInit": false
}, },
{
"Name": "AAModeProperty",
"Path": "vendor.powerhal.mode.aa",
"Values": [
"1",
"0"
],
"ResetOnInit": true,
"Type": "Property"
},
{ {
"Name": "KswapdUclaimMin", "Name": "KswapdUclaimMin",
"Path": "/sys/kernel/vendor_mm/kswapd_uclamp_min", "Path": "/sys/kernel/vendor_mm/kswapd_uclamp_min",
@ -3213,6 +3243,12 @@
"Duration": 0, "Duration": 0,
"Value": "1" "Value": "1"
}, },
{
"PowerHint": "AUTOMOTIVE_PROJECTION",
"Node": "AAModeProperty",
"Duration": 0,
"Value": "1"
},
{ {
"PowerHint": "DISPLAY_IDLE", "PowerHint": "DISPLAY_IDLE",
"Node": "FGPreferIdle", "Node": "FGPreferIdle",
@ -3254,6 +3290,18 @@
"Duration": 0, "Duration": 0,
"Value": "170" "Value": "170"
}, },
{
"PowerHint": "DISPLAY_IDLE",
"Type": "MaskHint",
"Value":"DISPLAY_UPDATE_IMMINENT",
"EnableProperty": "vendor.powerhal.mode.aa"
},
{
"PowerHint": "DISPLAY_IDLE",
"Type": "MaskHint",
"Value":"CPU_LOAD_RESET",
"EnableProperty": "vendor.powerhal.mode.aa"
},
{ {
"PowerHint": "DISPLAY_UPDATE_IMMINENT", "PowerHint": "DISPLAY_UPDATE_IMMINENT",
"Node": "CPULittleClusterDownRateLimitUs", "Node": "CPULittleClusterDownRateLimitUs",
@ -3398,6 +3446,18 @@
"Duration": 0, "Duration": 0,
"Value": "1" "Value": "1"
}, },
{
"PowerHint": "THERMAL_ShutdownMode_EMERGENCY",
"Node": "ntc_critical_trip",
"Duration": 0,
"Value": "70000"
},
{
"PowerHint": "THERMAL_ShutdownMode_EMERGENCY",
"Node": "ntc_hot_trip",
"Duration": 0,
"Value": "75000"
},
{ {
"PowerHint": "GAME", "PowerHint": "GAME",
"Node": "PMU_POLL", "Node": "PMU_POLL",

View file

@ -49,6 +49,11 @@
"Name":"battery", "Name":"battery",
"Type":"BATTERY", "Type":"BATTERY",
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 60.0], "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 60.0],
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.9],
"SendCallback": true,
"TripPointIgnorable": true,
"PollingDelay": 60000,
"PassiveDelay": 60000,
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {

View file

@ -49,6 +49,11 @@
"Name":"battery", "Name":"battery",
"Type":"BATTERY", "Type":"BATTERY",
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 60.0], "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 60.0],
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.9],
"SendCallback": true,
"TripPointIgnorable": true,
"PollingDelay": 60000,
"PassiveDelay": 60000,
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {

View file

@ -0,0 +1,85 @@
{
"Include": ["thermal_info_config.json"],
"Sensors":[
{
"Name":"SkinShutdownModeHighPower",
"Type":"UNKNOWN",
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["VIRTUAL-SKIN", "PARTIAL_SYSTEM_POWER"],
"CombinationType":["SENSOR", "ODPM"],
"Coefficient":[55000.0, 1000.0],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 2.0],
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.9],
"Multiplier":1
},
{
"Name":"BatteryShutdownModeHighPower",
"Type":"UNKNOWN",
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["battery", "PARTIAL_SYSTEM_POWER"],
"CombinationType":["SENSOR", "ODPM"],
"Coefficient":[60000.0, 1000.0],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 2.0],
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.9],
"Multiplier":1
},
{
"Name":"battery",
"Type":"BATTERY",
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 60.0, 65.0],
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 5.0, 1.9],
"SeverityReference": "BatteryShutdownModeHighPower",
"SendCallback": true,
"TripPointIgnorable": true,
"PollingDelay": 60000,
"PassiveDelay": 60000,
"Multiplier":0.001
},
{
"Name":"ShutdownMode",
"Type":"UNKNOWN",
"VirtualSensor":true,
"TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
"Formula":"WEIGHTED_AVG",
"Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 55.0, "NAN"],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 4.9, 1.9],
"SeverityReference": "battery",
"Multiplier":0.001,
"SendCallback": true,
"SendPowerHint": true,
"PollingDelay":300000,
"PassiveDelay":7000
},
{
"Name": "VIRTUAL-SKIN",
"Type": "SKIN",
"Version": "6.1",
"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-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, 65.0],
"HotHysteresis": [0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"SeverityReference": "SkinShutdownModeHighPower",
"Multiplier": 0.001,
"SendCallback": true,
"PollingDelay": 300000,
"PassiveDelay": 7000,
"PredictorInfo": {
"Sensor": "VIRTUAL-SKIN-LSTM-MODEL"
},
"BindedCdevInfo": [
{
"CdevRequest": "gxp-cooling",
"LimitInfo": [0, 0, 0, 0, 0, 6, 6]
}
]
}
]
}

View file

@ -0,0 +1,85 @@
{
"Include": ["thermal_info_config.json"],
"Sensors":[
{
"Name":"SkinShutdownModeHighPower",
"Type":"UNKNOWN",
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["VIRTUAL-SKIN", "PARTIAL_SYSTEM_POWER"],
"CombinationType":["SENSOR", "ODPM"],
"Coefficient":[55000.0, 1000.0],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 2.0],
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.9],
"Multiplier":1
},
{
"Name":"BatteryShutdownModeHighPower",
"Type":"UNKNOWN",
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["battery", "PARTIAL_SYSTEM_POWER"],
"CombinationType":["SENSOR", "ODPM"],
"Coefficient":[60000.0, 1000.0],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 2.0],
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.9],
"Multiplier":1
},
{
"Name":"battery",
"Type":"BATTERY",
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 60.0, 65.0],
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 5.0, 1.9],
"SeverityReference": "BatteryShutdownModeHighPower",
"SendCallback": true,
"TripPointIgnorable": true,
"PollingDelay": 60000,
"PassiveDelay": 60000,
"Multiplier":0.001
},
{
"Name":"ShutdownMode",
"Type":"UNKNOWN",
"VirtualSensor":true,
"TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
"Formula":"WEIGHTED_AVG",
"Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 55.0, "NAN"],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 4.9, 1.9],
"SeverityReference": "battery",
"Multiplier":0.001,
"SendCallback": true,
"SendPowerHint": true,
"PollingDelay":300000,
"PassiveDelay":7000
},
{
"Name": "VIRTUAL-SKIN",
"Type": "SKIN",
"Version": "6.1",
"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-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, 65.0],
"HotHysteresis": [0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"SeverityReference": "SkinShutdownModeHighPower",
"Multiplier": 0.001,
"SendCallback": true,
"PollingDelay": 300000,
"PassiveDelay": 7000,
"PredictorInfo": {
"Sensor": "VIRTUAL-SKIN-LSTM-MODEL"
},
"BindedCdevInfo": [
{
"CdevRequest": "gxp-cooling",
"LimitInfo": [0, 0, 0, 0, 0, 6, 6]
}
]
}
]
}

View file

@ -0,0 +1,85 @@
{
"Include": ["thermal_info_config.json"],
"Sensors":[
{
"Name":"SkinShutdownModeHighPower",
"Type":"UNKNOWN",
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["VIRTUAL-SKIN", "PARTIAL_SYSTEM_POWER"],
"CombinationType":["SENSOR", "ODPM"],
"Coefficient":[55000.0, 1000.0],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 2.0],
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.9],
"Multiplier":1
},
{
"Name":"BatteryShutdownModeHighPower",
"Type":"UNKNOWN",
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["battery", "PARTIAL_SYSTEM_POWER"],
"CombinationType":["SENSOR", "ODPM"],
"Coefficient":[60000.0, 1000.0],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 2.0],
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.9],
"Multiplier":1
},
{
"Name":"battery",
"Type":"BATTERY",
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 60.0, 65.0],
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 5.0, 1.9],
"SeverityReference": "BatteryShutdownModeHighPower",
"SendCallback": true,
"TripPointIgnorable": true,
"PollingDelay": 60000,
"PassiveDelay": 60000,
"Multiplier":0.001
},
{
"Name":"ShutdownMode",
"Type":"UNKNOWN",
"VirtualSensor":true,
"TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
"Formula":"WEIGHTED_AVG",
"Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 55.0, "NAN"],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 4.9, 1.9],
"SeverityReference": "battery",
"Multiplier":0.001,
"SendCallback": true,
"SendPowerHint": true,
"PollingDelay":300000,
"PassiveDelay":7000
},
{
"Name": "VIRTUAL-SKIN",
"Type": "SKIN",
"Version": "6.1",
"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-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, 60.0],
"HotHysteresis": [0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"SeverityReference": "SkinShutdownModeHighPower",
"Multiplier": 0.001,
"SendCallback": true,
"PollingDelay": 300000,
"PassiveDelay": 7000,
"PredictorInfo": {
"Sensor": "VIRTUAL-SKIN-LSTM-MODEL"
},
"BindedCdevInfo": [
{
"CdevRequest": "gxp-cooling",
"LimitInfo": [0, 0, 0, 0, 0, 6, 6]
}
]
}
]
}

View file

@ -60,434 +60,6 @@
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":0.001 "Multiplier":0.001
}, },
{
"Name":"battery_cycle",
"Type":"BCL_VOLTAGE",
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN"
],
"VrThreshold":"NAN",
"Multiplier":1,
"Monitor":false
},
{
"Name":"FLASH_LED_REDUCE",
"Type":"UNKNOWN",
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"TriggerSensor": "vdroop1",
"Combination":[
"battery",
"battery_cycle",
"vdroop1"
],
"Coefficient":[
"-10000",
"400",
"1000"
],
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
3.00,
"NAN",
"NAN"
],
"VrThreshold":"NAN",
"Multiplier":1,
"Monitor":true,
"SendPowerHint":true
},
{
"Name":"soc",
"Type":"BCL_PERCENTAGE",
"HotThreshold":[
"NAN",
80,
"NAN",
"NAN",
"NAN",
"NAN",
"NAN"
],
"VrThreshold":"NAN",
"Multiplier":1
},
{
"Name":"batoilo",
"Type":"BCL_CURRENT",
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
5000,
"NAN",
"NAN"
],
"HotHysteresis":[
0.0,
0.0,
0.0,
0.0,
100,
0.0,
0.0
],
"VrThreshold":"NAN",
"Multiplier":1,
"Monitor":true,
"PollingDelay":0,
"PassiveDelay":1000,
"BindedCdevInfo": [
{
"CdevRequest": "thermal-cpufreq-2",
"LimitInfo": [0, 0, 0, 0, 7, 7, 7]
},
{
"CdevRequest": "thermal-gpufreq-0",
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
}
]
},
{
"Name":"BCL_AUDIO_BAACL",
"Type":"BCL_VOLTAGE",
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"TriggerSensor": "soc",
"Combination":[
"battery",
"soc"
],
"Coefficient":[
"-25000",
"80"
],
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
2.0,
"NAN",
"NAN"
],
"VrThreshold":"NAN",
"Multiplier":1,
"Monitor":true
},
{
"Name":"vdroop1",
"Type":"BCL_VOLTAGE",
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
1000,
"NAN",
"NAN"
],
"HotHysteresis":[
0.0,
0.0,
0.0,
0.0,
100,
0.0,
0.0
],
"VrThreshold":"NAN",
"Multiplier":1,
"Monitor":true,
"PollingDelay":0,
"PassiveDelay":1000,
"BindedCdevInfo": [
{
"CdevRequest": "thermal-cpufreq-2",
"LimitInfo": [0, 0, 0, 0, 7, 10, 10]
},
{
"CdevRequest": "thermal-gpufreq-0",
"LimitInfo": [0, 0, 0, 0, 2, 2, 2]
}
]
},
{
"Name":"vdroop2",
"Type":"BCL_VOLTAGE",
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
1200,
"NAN",
"NAN"
],
"HotHysteresis":[
0.0,
0.0,
0.0,
0.0,
100,
0.0,
0.0
],
"VrThreshold":"NAN",
"Multiplier":1,
"Monitor":true,
"PollingDelay":0,
"PassiveDelay":1000,
"BindedCdevInfo": [
{
"CdevRequest": "thermal-cpufreq-2",
"LimitInfo": [0, 0, 0, 0, 7, 10, 10]
},
{
"CdevRequest": "thermal-gpufreq-0",
"LimitInfo": [0, 0, 0, 0, 4, 4, 4]
}
]
},
{
"Name":"smpl_gm",
"Type":"BCL_VOLTAGE",
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
1100,
"NAN",
"NAN"
],
"HotHysteresis":[
0.0,
0.0,
0.0,
0.0,
100,
0.0,
0.0
],
"VrThreshold":"NAN",
"Multiplier":1,
"Monitor":true,
"PollingDelay":0,
"PassiveDelay":1000,
"BindedCdevInfo": [
{
"CdevRequest": "thermal-cpufreq-2",
"LimitInfo": [0, 0, 0, 0, 7, 10, 10]
},
{
"CdevRequest": "thermal-gpufreq-0",
"LimitInfo": [0, 0, 0, 0, 3, 3, 3]
}
]
},
{
"Name":"ocp_cpu1",
"Type":"BCL_CURRENT",
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
7000,
"NAN",
"NAN"
],
"HotHysteresis":[
0.0,
0.0,
0.0,
0.0,
100,
0.0,
0.0
],
"VrThreshold":"NAN",
"Multiplier":1
},
{
"Name":"ocp_cpu2",
"Type":"BCL_CURRENT",
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
12000,
"NAN",
"NAN"
],
"HotHysteresis":[
0.0,
0.0,
0.0,
0.0,
100,
0.0,
0.0
],
"VrThreshold":"NAN",
"Multiplier":1
},
{
"Name":"ocp_tpu",
"Type":"BCL_CURRENT",
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
10500,
"NAN",
"NAN"
],
"HotHysteresis":[
0.0,
0.0,
0.0,
0.0,
100,
0.0,
0.0
],
"VrThreshold":"NAN",
"Multiplier":1
},
{
"Name":"ocp_gpu",
"Type":"BCL_CURRENT",
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
12000,
"NAN",
"NAN"
],
"HotHysteresis":[
0.0,
0.0,
0.0,
0.0,
100,
0.0,
0.0
],
"VrThreshold":"NAN",
"Multiplier":1
},
{
"Name":"soft_ocp_cpu2",
"Type":"BCL_CURRENT",
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
9000,
"NAN",
"NAN"
],
"HotHysteresis":[
0.0,
0.0,
0.0,
0.0,
100,
0.0,
0.0
],
"VrThreshold":"NAN",
"Multiplier":1
},
{
"Name":"soft_ocp_cpu1",
"Type":"BCL_CURRENT",
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
7000,
"NAN",
"NAN"
],
"HotHysteresis":[
0.0,
0.0,
0.0,
0.0,
100,
0.0,
0.0
],
"VrThreshold":"NAN",
"Multiplier":1
},
{
"Name":"soft_ocp_tpu",
"Type":"BCL_CURRENT",
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
8500,
"NAN",
"NAN"
],
"HotHysteresis":[
0.0,
0.0,
0.0,
0.0,
100,
0.0,
0.0
],
"VrThreshold":"NAN",
"Multiplier":1
},
{
"Name":"soft_ocp_gpu",
"Type":"BCL_CURRENT",
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
9000,
"NAN",
"NAN"
],
"HotHysteresis":[
0.0,
0.0,
0.0,
0.0,
100,
0.0,
0.0
],
"VrThreshold":"NAN",
"Multiplier":1
},
{ {
"Name":"TPU", "Name":"TPU",
"Type":"NPU", "Type":"NPU",

View file

@ -49,6 +49,11 @@
"Name":"battery", "Name":"battery",
"Type":"BATTERY", "Type":"BATTERY",
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 60.0], "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 60.0],
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.9],
"SendCallback": true,
"TripPointIgnorable": true,
"PollingDelay": 60000,
"PassiveDelay": 60000,
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {

View file

@ -227,4 +227,11 @@
<!-- Package name providing GNSS location support. Used only when <!-- Package name providing GNSS location support. Used only when
config_useGnssHardwareProvider is false. --> config_useGnssHardwareProvider is false. -->
<string name="config_gnssLocationProviderPackageName" translatable="false">com.google.android.gms</string> <string name="config_gnssLocationProviderPackageName" translatable="false">com.google.android.gms</string>
<!-- Whether to enable fp unlock when screen turns off on udfps devices -->
<bool name="config_screen_off_udfps_enabled">true</bool>
<!-- Default value for fp screen off unlock toggle, it only works for the devices that support
fp screen off unlock-->
<bool name="config_screen_off_udfps_default_on">false</bool>
</resources> </resources>

View file

@ -25,6 +25,8 @@
Values should be ISO3166 country codes in lowercase. --> Values should be ISO3166 country codes in lowercase. -->
<string-array name="config_countries_dynamic_routing_emergency_enabled" <string-array name="config_countries_dynamic_routing_emergency_enabled"
translatable="false"> translatable="false">
<!-- b/393518741 -->
<item>cz</item>
<item>in</item> <item>in</item>
<item>il</item> <item>il</item>
<item>tw</item> <item>tw</item>
@ -40,6 +42,9 @@
Values are the tuples of Country ISO, MNC, and numbers. --> Values are the tuples of Country ISO, MNC, and numbers. -->
<string-array name="config_dynamic_routing_emergency_numbers" <string-array name="config_dynamic_routing_emergency_numbers"
translatable="false"> translatable="false">
<!-- b/393518741 -->
<item>cz,01,156</item>
<item>cz,03,156</item>
<item>in,,101,102,103,108</item> <item>in,,101,102,103,108</item>
<item>il,,101,102</item> <item>il,,101,102</item>
<item>tw,,110,119</item> <item>tw,,110,119</item>