diff --git a/aosp_caiman.mk b/aosp_caiman.mk index 54314020..a1b42927 100644 --- a/aosp_caiman.mk +++ b/aosp_caiman.mk @@ -27,6 +27,3 @@ PRODUCT_DEVICE := caiman PRODUCT_MODEL := AOSP on caiman PRODUCT_BRAND := Android PRODUCT_MANUFACTURER := Google - -DEVICE_MANIFEST_FILE := \ - device/google/caimito/manifest.xml diff --git a/aosp_komodo.mk b/aosp_komodo.mk index 22f66114..d1a95f62 100644 --- a/aosp_komodo.mk +++ b/aosp_komodo.mk @@ -27,6 +27,3 @@ PRODUCT_DEVICE := komodo PRODUCT_MODEL := AOSP on komodo PRODUCT_BRAND := Android PRODUCT_MANUFACTURER := Google - -DEVICE_MANIFEST_FILE := \ - device/google/caimito/manifest.xml diff --git a/aosp_ripcurrent24.mk b/aosp_ripcurrent24.mk index f7ba284c..633a237a 100644 --- a/aosp_ripcurrent24.mk +++ b/aosp_ripcurrent24.mk @@ -27,6 +27,3 @@ PRODUCT_DEVICE := ripcurrent24 PRODUCT_MODEL := AOSP on ripcurrent24 PRODUCT_BRAND := Android PRODUCT_MANUFACTURER := Google - -DEVICE_MANIFEST_FILE := \ - device/google/caimito/manifest.xml diff --git a/aosp_ripcurrentpro.mk b/aosp_ripcurrentpro.mk index b9dece69..32f0754b 100644 --- a/aosp_ripcurrentpro.mk +++ b/aosp_ripcurrentpro.mk @@ -27,6 +27,3 @@ PRODUCT_DEVICE := ripcurrentpro PRODUCT_MODEL := AOSP on ripcurrentpro PRODUCT_BRAND := Android PRODUCT_MANUFACTURER := Google - -DEVICE_MANIFEST_FILE := \ - device/google/caimito/manifest.xml diff --git a/aosp_tokay.mk b/aosp_tokay.mk index 7eb10a63..795aabff 100644 --- a/aosp_tokay.mk +++ b/aosp_tokay.mk @@ -27,6 +27,3 @@ PRODUCT_DEVICE := tokay PRODUCT_MODEL := AOSP on tokay PRODUCT_BRAND := Android PRODUCT_MANUFACTURER := Google - -DEVICE_MANIFEST_FILE := \ - device/google/caimito/manifest.xml diff --git a/caiman/overlay/frameworks/base/core/res/res/values/config.xml b/caiman/overlay/frameworks/base/core/res/res/values/config.xml index ada5548d..5f5daca6 100644 --- a/caiman/overlay/frameworks/base/core/res/res/values/config.xml +++ b/caiman/overlay/frameworks/base/core/res/res/values/config.xml @@ -168,6 +168,9 @@ com.google.sensor.quick_pickup + + true + @@ -227,4 +230,11 @@ com.google.android.gms + + + true + + + false diff --git a/caiman/overlay/packages/services/Telephony/res/values/config.xml b/caiman/overlay/packages/services/Telephony/res/values/config.xml index 4fe41dd2..0015ec6d 100644 --- a/caiman/overlay/packages/services/Telephony/res/values/config.xml +++ b/caiman/overlay/packages/services/Telephony/res/values/config.xml @@ -25,6 +25,8 @@ Values should be ISO3166 country codes in lowercase. --> + + cz in il tw @@ -40,6 +42,9 @@ Values are the tuples of Country ISO, MNC, and numbers. --> + + cz,01,156 + cz,03,156 in,,101,102,103,108 il,,101,102 tw,,110,119 diff --git a/caiman/rro_overlays/UwbOverlay/Android.bp b/caiman/rro_overlays/UwbOverlay/Android.bp index db283b43..64312d88 100644 --- a/caiman/rro_overlays/UwbOverlay/Android.bp +++ b/caiman/rro_overlays/UwbOverlay/Android.bp @@ -16,3 +16,11 @@ runtime_resource_overlay { sdk_version: "current", product_specific: true, } + +runtime_resource_overlay { + name: "UwbOverlayCM4Gsi", + theme: "UwbOverlayCM4", + certificate: "platform", + sdk_version: "current", + vendor: true, +} diff --git a/device-caiman.mk b/device-caiman.mk index 40e5e5f4..cdc0ec2e 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -40,8 +40,6 @@ ifneq ($(TARGET_BOOTS_16K),true) PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_CAIMAN_16K_DEVELOPER_OPTION) endif -include device/google/caimito/device-caimito-16k-common.mk - else TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1 TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers @@ -298,7 +296,8 @@ PRODUCT_SOONG_NAMESPACES += \ # UWB Overlay PRODUCT_PACKAGES += \ - UwbOverlayCM4 + UwbOverlayCM4 \ + UwbOverlayCM4Gsi # WiFi Overlay PRODUCT_PACKAGES += \ @@ -389,8 +388,7 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.vibrator.hal.context.scale=60 \ persist.vendor.vibrator.hal.context.fade=true \ persist.vendor.vibrator.hal.context.cooldowntime=1600 \ - persist.vendor.vibrator.hal.context.settlingtime=5000 \ - ro.vendor.vibrator.hal.pm.activetimeout=5 + persist.vendor.vibrator.hal.context.settlingtime=5000 # Override Output Distortion Gain PRODUCT_VENDOR_PROPERTIES += \ diff --git a/device-caimito-16k-common.mk b/device-caimito-16k-common.mk deleted file mode 100644 index b224f4f4..00000000 --- a/device-caimito-16k-common.mk +++ /dev/null @@ -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 - diff --git a/device-caimito-common.mk b/device-caimito-common.mk index 12c9b1a5..9a333318 100644 --- a/device-caimito-common.mk +++ b/device-caimito-common.mk @@ -27,6 +27,7 @@ PRODUCT_COPY_FILES += \ ifneq (,$(filter $(TARGET_DEVICE),komodo caiman tokay)) 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_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_prediction_lstm_model_$(TARGET_DEVICE).tflite:$(TARGET_COPY_OUT_VENDOR)/etc/vt_prediction_lstm_model.tflite ifneq (,$(filter $(TARGET_BUILD_VARIANT), userdebug eng)) diff --git a/device-komodo.mk b/device-komodo.mk index 365b80cc..dfceb45f 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -40,8 +40,6 @@ ifneq ($(TARGET_BOOTS_16K),true) PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_KOMODO_16K_DEVELOPER_OPTION) endif -include device/google/caimito/device-caimito-16k-common.mk - else TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1 TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers @@ -318,7 +316,8 @@ PRODUCT_SOONG_NAMESPACES += \ # UWB Overlay PRODUCT_PACKAGES += \ - UwbOverlayKM4 + UwbOverlayKM4 \ + UwbOverlayKM4Gsi # WiFi Overlay PRODUCT_PACKAGES += \ @@ -390,8 +389,7 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.vibrator.hal.context.scale=60 \ persist.vendor.vibrator.hal.context.fade=true \ persist.vendor.vibrator.hal.context.cooldowntime=1600 \ - persist.vendor.vibrator.hal.context.settlingtime=5000 \ - ro.vendor.vibrator.hal.pm.activetimeout=5 + persist.vendor.vibrator.hal.context.settlingtime=5000 # Override Output Distortion Gain PRODUCT_VENDOR_PROPERTIES += \ diff --git a/device-tokay.mk b/device-tokay.mk index f1377845..f52aa24a 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -40,8 +40,6 @@ ifneq ($(TARGET_BOOTS_16K),true) PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_TOKAY_16K_DEVELOPER_OPTION) endif -include device/google/caimito/device-caimito-16k-common.mk - else TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1 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.fade=true \ persist.vendor.vibrator.hal.context.cooldowntime=1600 \ - persist.vendor.vibrator.hal.context.settlingtime=5000 \ - ro.vendor.vibrator.hal.pm.activetimeout=5 + persist.vendor.vibrator.hal.context.settlingtime=5000 # Override Output Distortion Gain PRODUCT_VENDOR_PROPERTIES += \ diff --git a/fingerprint/device_framework_matrix_product.xml b/fingerprint/device_framework_matrix_product.xml index 41a113bf..6d1673fb 100644 --- a/fingerprint/device_framework_matrix_product.xml +++ b/fingerprint/device_framework_matrix_product.xml @@ -6,6 +6,13 @@ default + + com.google.hardware.biometrics.fingerprint.debug + + IFingerprintDebug + default + + vendor.qti.hardware.fingerprint 1 diff --git a/fingerprint/ultrasonic_udfps.mk b/fingerprint/ultrasonic_udfps.mk index a7c332c0..daf7e5a7 100644 --- a/fingerprint/ultrasonic_udfps.mk +++ b/fingerprint/ultrasonic_udfps.mk @@ -33,6 +33,8 @@ PRODUCT_PROPERTY_OVERRIDES += \ log.tag.QFP=3 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 += \ vendor/qcom/fingerprint/QFPCalibration diff --git a/komodo/overlay/frameworks/base/core/res/res/values/config.xml b/komodo/overlay/frameworks/base/core/res/res/values/config.xml index 5910fc63..da6fa374 100644 --- a/komodo/overlay/frameworks/base/core/res/res/values/config.xml +++ b/komodo/overlay/frameworks/base/core/res/res/values/config.xml @@ -168,6 +168,9 @@ com.google.sensor.quick_pickup + + true + @@ -227,4 +230,11 @@ com.google.android.gms + + + true + + + false diff --git a/komodo/overlay/packages/services/Telephony/res/values/config.xml b/komodo/overlay/packages/services/Telephony/res/values/config.xml index 4fe41dd2..0015ec6d 100644 --- a/komodo/overlay/packages/services/Telephony/res/values/config.xml +++ b/komodo/overlay/packages/services/Telephony/res/values/config.xml @@ -25,6 +25,8 @@ Values should be ISO3166 country codes in lowercase. --> + + cz in il tw @@ -40,6 +42,9 @@ Values are the tuples of Country ISO, MNC, and numbers. --> + + cz,01,156 + cz,03,156 in,,101,102,103,108 il,,101,102 tw,,110,119 diff --git a/komodo/rro_overlays/UwbOverlay/Android.bp b/komodo/rro_overlays/UwbOverlay/Android.bp index c0d723f7..5c6a3df2 100644 --- a/komodo/rro_overlays/UwbOverlay/Android.bp +++ b/komodo/rro_overlays/UwbOverlay/Android.bp @@ -14,5 +14,13 @@ runtime_resource_overlay { theme: "UwbOverlayKM4", certificate: "platform", sdk_version: "current", - product_specific: true + product_specific: true, +} + +runtime_resource_overlay { + name: "UwbOverlayKM4Gsi", + theme: "UwbOverlayKM4", + certificate: "platform", + sdk_version: "current", + vendor: true, } diff --git a/location/caiman/user/gps.cfg b/location/caiman/user/gps.cfg index 7d513998..974592e8 100644 --- a/location/caiman/user/gps.cfg +++ b/location/caiman/user/gps.cfg @@ -162,10 +162,14 @@ ENABLE_LPP_UP=1 ENABLE_LPPE_UP=3 GNSS_CARRIER_ID=6 +ENABLE_CAPS_OTDOA=0 ENABLE_LPP_CP=0 ENABLE_LPP_UP=1 ENABLE_LPPE_CP=0 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 ENABLE_LPP_CP=0 diff --git a/location/caiman/userdebug/gps.cfg b/location/caiman/userdebug/gps.cfg index 34528233..79dfe194 100644 --- a/location/caiman/userdebug/gps.cfg +++ b/location/caiman/userdebug/gps.cfg @@ -335,10 +335,14 @@ ENABLE_LPP_UP=1 ENABLE_LPPE_UP=3 # KDDI GNSS_CARRIER_ID=6 +ENABLE_CAPS_OTDOA=0 ENABLE_LPP_CP=0 ENABLE_LPP_UP=1 ENABLE_LPPE_CP=0 ENABLE_LPPE_UP=3 +ENABLE_2G_UP_CAPS_MSA=0 +ENABLE_3G_UP_CAPS_MSA=0 +ENABLE_4G_UP_CAPS_MSA=0 # SBM GNSS_CARRIER_ID=7 ENABLE_LPP_CP=0 diff --git a/location/komodo/user/gps.cfg b/location/komodo/user/gps.cfg index c380f621..fbc206ee 100644 --- a/location/komodo/user/gps.cfg +++ b/location/komodo/user/gps.cfg @@ -162,10 +162,14 @@ ENABLE_LPP_UP=1 ENABLE_LPPE_UP=3 GNSS_CARRIER_ID=6 +ENABLE_CAPS_OTDOA=0 ENABLE_LPP_CP=0 ENABLE_LPP_UP=1 ENABLE_LPPE_CP=0 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 ENABLE_LPP_CP=0 diff --git a/location/komodo/userdebug/gps.cfg b/location/komodo/userdebug/gps.cfg index 51316c80..7435ddf8 100644 --- a/location/komodo/userdebug/gps.cfg +++ b/location/komodo/userdebug/gps.cfg @@ -335,10 +335,14 @@ ENABLE_LPP_UP=1 ENABLE_LPPE_UP=3 # KDDI GNSS_CARRIER_ID=6 +ENABLE_CAPS_OTDOA=0 ENABLE_LPP_CP=0 ENABLE_LPP_UP=1 ENABLE_LPPE_CP=0 ENABLE_LPPE_UP=3 +ENABLE_2G_UP_CAPS_MSA=0 +ENABLE_3G_UP_CAPS_MSA=0 +ENABLE_4G_UP_CAPS_MSA=0 # SBM GNSS_CARRIER_ID=7 ENABLE_LPP_CP=0 diff --git a/location/ripcurrent24/user/gps.cfg b/location/ripcurrent24/user/gps.cfg index 166c91fe..a5ebd11d 100644 --- a/location/ripcurrent24/user/gps.cfg +++ b/location/ripcurrent24/user/gps.cfg @@ -154,10 +154,14 @@ ENABLE_LPP_UP=1 ENABLE_LPPE_UP=3 GNSS_CARRIER_ID=6 +ENABLE_CAPS_OTDOA=0 ENABLE_LPP_CP=0 ENABLE_LPP_UP=1 ENABLE_LPPE_CP=0 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 ENABLE_LPP_CP=0 diff --git a/location/ripcurrent24/userdebug/gps.cfg b/location/ripcurrent24/userdebug/gps.cfg index c3185b9a..9b82be3c 100644 --- a/location/ripcurrent24/userdebug/gps.cfg +++ b/location/ripcurrent24/userdebug/gps.cfg @@ -326,10 +326,14 @@ ENABLE_LPP_UP=1 ENABLE_LPPE_UP=3 # KDDI GNSS_CARRIER_ID=6 +ENABLE_CAPS_OTDOA=0 ENABLE_LPP_CP=0 ENABLE_LPP_UP=1 ENABLE_LPPE_CP=0 ENABLE_LPPE_UP=3 +ENABLE_2G_UP_CAPS_MSA=0 +ENABLE_3G_UP_CAPS_MSA=0 +ENABLE_4G_UP_CAPS_MSA=0 # SBM GNSS_CARRIER_ID=7 ENABLE_LPP_CP=0 diff --git a/location/ripcurrentpro/user/gps.cfg b/location/ripcurrentpro/user/gps.cfg index 166c91fe..a5ebd11d 100644 --- a/location/ripcurrentpro/user/gps.cfg +++ b/location/ripcurrentpro/user/gps.cfg @@ -154,10 +154,14 @@ ENABLE_LPP_UP=1 ENABLE_LPPE_UP=3 GNSS_CARRIER_ID=6 +ENABLE_CAPS_OTDOA=0 ENABLE_LPP_CP=0 ENABLE_LPP_UP=1 ENABLE_LPPE_CP=0 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 ENABLE_LPP_CP=0 diff --git a/location/ripcurrentpro/userdebug/gps.cfg b/location/ripcurrentpro/userdebug/gps.cfg index c3185b9a..9b82be3c 100644 --- a/location/ripcurrentpro/userdebug/gps.cfg +++ b/location/ripcurrentpro/userdebug/gps.cfg @@ -326,10 +326,14 @@ ENABLE_LPP_UP=1 ENABLE_LPPE_UP=3 # KDDI GNSS_CARRIER_ID=6 +ENABLE_CAPS_OTDOA=0 ENABLE_LPP_CP=0 ENABLE_LPP_UP=1 ENABLE_LPPE_CP=0 ENABLE_LPPE_UP=3 +ENABLE_2G_UP_CAPS_MSA=0 +ENABLE_3G_UP_CAPS_MSA=0 +ENABLE_4G_UP_CAPS_MSA=0 # SBM GNSS_CARRIER_ID=7 ENABLE_LPP_CP=0 diff --git a/location/tokay/user/gps.cfg b/location/tokay/user/gps.cfg index 3b4a94e5..d3da4a2d 100644 --- a/location/tokay/user/gps.cfg +++ b/location/tokay/user/gps.cfg @@ -162,10 +162,14 @@ ENABLE_LPP_UP=1 ENABLE_LPPE_UP=3 GNSS_CARRIER_ID=6 +ENABLE_CAPS_OTDOA=0 ENABLE_LPP_CP=0 ENABLE_LPP_UP=1 ENABLE_LPPE_CP=0 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 ENABLE_LPP_CP=0 diff --git a/location/tokay/userdebug/gps.cfg b/location/tokay/userdebug/gps.cfg index aeca2242..1c7e2c40 100644 --- a/location/tokay/userdebug/gps.cfg +++ b/location/tokay/userdebug/gps.cfg @@ -335,10 +335,14 @@ ENABLE_LPP_UP=1 ENABLE_LPPE_UP=3 # KDDI GNSS_CARRIER_ID=6 +ENABLE_CAPS_OTDOA=0 ENABLE_LPP_CP=0 ENABLE_LPP_UP=1 ENABLE_LPPE_CP=0 ENABLE_LPPE_UP=3 +ENABLE_2G_UP_CAPS_MSA=0 +ENABLE_3G_UP_CAPS_MSA=0 +ENABLE_4G_UP_CAPS_MSA=0 # SBM GNSS_CARRIER_ID=7 ENABLE_LPP_CP=0 diff --git a/manifest.xml b/manifest.xml deleted file mode 100644 index 18109c63..00000000 --- a/manifest.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - android.hardware.audio - hwbinder - 7.1 - - IDevicesFactory - default - - - - android.hardware.audio.effect - hwbinder - 7.0 - - IEffectsFactory - default - - - - android.hardware.soundtrigger - hwbinder - 2.3 - - ISoundTriggerHw - default - - - - android.hardware.media.omx - hwbinder - 1.0 - - IOmx - default - - - IOmxStore - default - - - - android.hardware.graphics.allocator - hwbinder - 4.0 - - IAllocator - default - - - - android.hardware.graphics.composer - hwbinder - 2.4 - - IComposer - default - - - - android.hardware.renderscript - passthrough - 1.0 - - IDevice - default - - - - android.hardware.dumpstate - hwbinder - 1.1 - - IDumpstateDevice - default - - - - android.hardware.bluetooth.audio - hwbinder - 2.1 - - IBluetoothAudioProvidersFactory - default - - - - android.hardware.boot - hwbinder - @1.2::IBootControl/default - - - android.hardware.neuralnetworks - hwbinder - @1.3::IDevice/google-edgetpu - - - android.hardware.health - hwbinder - 2.1 - - IHealth - default - - - - vendor.google.whitechapel.audio.audioext - hwbinder - 4.0 - - IAudioExt - default - - - - diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json index 3670723a..4407c375 100644 --- a/perf/powerhint-caiman.json +++ b/perf/powerhint-caiman.json @@ -888,6 +888,26 @@ "ResetOnInit": true, "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", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", @@ -993,6 +1013,16 @@ "WriteOnly": true, "ResetOnInit": false }, + { + "Name": "AAModeProperty", + "Path": "vendor.powerhal.mode.aa", + "Values": [ + "1", + "0" + ], + "ResetOnInit": true, + "Type": "Property" + }, { "Name": "KswapdUclaimMin", "Path": "/sys/kernel/vendor_mm/kswapd_uclamp_min", @@ -3213,6 +3243,12 @@ "Duration": 0, "Value": "1" }, + { + "PowerHint": "AUTOMOTIVE_PROJECTION", + "Node": "AAModeProperty", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "DISPLAY_IDLE", "Node": "FGPreferIdle", @@ -3254,6 +3290,18 @@ "Duration": 0, "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", "Node": "CPULittleClusterDownRateLimitUs", @@ -3398,6 +3446,18 @@ "Duration": 0, "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", "Node": "PMU_POLL", diff --git a/perf/powerhint-komodo.json b/perf/powerhint-komodo.json index c7512d89..c466a27e 100644 --- a/perf/powerhint-komodo.json +++ b/perf/powerhint-komodo.json @@ -888,6 +888,26 @@ "ResetOnInit": true, "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", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", @@ -993,6 +1013,16 @@ "WriteOnly": true, "ResetOnInit": false }, + { + "Name": "AAModeProperty", + "Path": "vendor.powerhal.mode.aa", + "Values": [ + "1", + "0" + ], + "ResetOnInit": true, + "Type": "Property" + }, { "Name": "KswapdUclaimMin", "Path": "/sys/kernel/vendor_mm/kswapd_uclamp_min", @@ -3213,6 +3243,12 @@ "Duration": 0, "Value": "1" }, + { + "PowerHint": "AUTOMOTIVE_PROJECTION", + "Node": "AAModeProperty", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "DISPLAY_IDLE", "Node": "FGPreferIdle", @@ -3254,6 +3290,18 @@ "Duration": 0, "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", "Node": "CPULittleClusterDownRateLimitUs", @@ -3398,6 +3446,18 @@ "Duration": 0, "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", "Node": "PMU_POLL", diff --git a/perf/powerhint-tokay.json b/perf/powerhint-tokay.json index 985e4d63..0fdcd373 100644 --- a/perf/powerhint-tokay.json +++ b/perf/powerhint-tokay.json @@ -888,6 +888,26 @@ "ResetOnInit": true, "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", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", @@ -993,6 +1013,16 @@ "WriteOnly": true, "ResetOnInit": false }, + { + "Name": "AAModeProperty", + "Path": "vendor.powerhal.mode.aa", + "Values": [ + "1", + "0" + ], + "ResetOnInit": true, + "Type": "Property" + }, { "Name": "KswapdUclaimMin", "Path": "/sys/kernel/vendor_mm/kswapd_uclamp_min", @@ -3213,6 +3243,12 @@ "Duration": 0, "Value": "1" }, + { + "PowerHint": "AUTOMOTIVE_PROJECTION", + "Node": "AAModeProperty", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "DISPLAY_IDLE", "Node": "FGPreferIdle", @@ -3254,6 +3290,18 @@ "Duration": 0, "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", "Node": "CPULittleClusterDownRateLimitUs", @@ -3398,6 +3446,18 @@ "Duration": 0, "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", "Node": "PMU_POLL", diff --git a/thermal/thermal_info_config_caiman.json b/thermal/thermal_info_config_caiman.json index 6369238a..a177c704 100644 --- a/thermal/thermal_info_config_caiman.json +++ b/thermal/thermal_info_config_caiman.json @@ -49,6 +49,11 @@ "Name":"battery", "Type":"BATTERY", "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 }, { diff --git a/thermal/thermal_info_config_komodo.json b/thermal/thermal_info_config_komodo.json index e1ae5722..48793e79 100644 --- a/thermal/thermal_info_config_komodo.json +++ b/thermal/thermal_info_config_komodo.json @@ -49,6 +49,11 @@ "Name":"battery", "Type":"BATTERY", "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 }, { diff --git a/thermal/thermal_info_config_lpm_caiman.json b/thermal/thermal_info_config_lpm_caiman.json new file mode 100644 index 00000000..543f27d8 --- /dev/null +++ b/thermal/thermal_info_config_lpm_caiman.json @@ -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] + } + ] + } + ] +} diff --git a/thermal/thermal_info_config_lpm_komodo.json b/thermal/thermal_info_config_lpm_komodo.json new file mode 100644 index 00000000..543f27d8 --- /dev/null +++ b/thermal/thermal_info_config_lpm_komodo.json @@ -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] + } + ] + } + ] +} diff --git a/thermal/thermal_info_config_lpm_tokay.json b/thermal/thermal_info_config_lpm_tokay.json new file mode 100644 index 00000000..dab369e0 --- /dev/null +++ b/thermal/thermal_info_config_lpm_tokay.json @@ -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] + } + ] + } + ] +} diff --git a/thermal/thermal_info_config_ripcurrent24.json b/thermal/thermal_info_config_ripcurrent24.json index f081771b..6d05ad76 100644 --- a/thermal/thermal_info_config_ripcurrent24.json +++ b/thermal/thermal_info_config_ripcurrent24.json @@ -60,434 +60,6 @@ "VrThreshold":"NAN", "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", "Type":"NPU", diff --git a/thermal/thermal_info_config_tokay.json b/thermal/thermal_info_config_tokay.json index 30a492c8..8c5da4a5 100644 --- a/thermal/thermal_info_config_tokay.json +++ b/thermal/thermal_info_config_tokay.json @@ -49,6 +49,11 @@ "Name":"battery", "Type":"BATTERY", "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 }, { diff --git a/tokay/overlay/frameworks/base/core/res/res/values/config.xml b/tokay/overlay/frameworks/base/core/res/res/values/config.xml index 0018e7cc..63b22958 100644 --- a/tokay/overlay/frameworks/base/core/res/res/values/config.xml +++ b/tokay/overlay/frameworks/base/core/res/res/values/config.xml @@ -227,4 +227,11 @@ com.google.android.gms + + + true + + + false diff --git a/tokay/overlay/packages/services/Telephony/res/values/config.xml b/tokay/overlay/packages/services/Telephony/res/values/config.xml index 4fe41dd2..0015ec6d 100644 --- a/tokay/overlay/packages/services/Telephony/res/values/config.xml +++ b/tokay/overlay/packages/services/Telephony/res/values/config.xml @@ -25,6 +25,8 @@ Values should be ISO3166 country codes in lowercase. --> + + cz in il tw @@ -40,6 +42,9 @@ Values are the tuples of Country ISO, MNC, and numbers. --> + + cz,01,156 + cz,03,156 in,,101,102,103,108 il,,101,102 tw,,110,119