diff --git a/aosp_comet.mk b/aosp_comet.mk index c874834..3298e82 100644 --- a/aosp_comet.mk +++ b/aosp_comet.mk @@ -24,6 +24,3 @@ PRODUCT_DEVICE := comet PRODUCT_MODEL := AOSP on comet PRODUCT_BRAND := Android PRODUCT_MANUFACTURER := Google - -DEVICE_MANIFEST_FILE := \ - device/google/comet/manifest.xml diff --git a/audio/comet/aidl_config/mixer_paths_aidl.xml b/audio/comet/aidl_config/mixer_paths_aidl.xml index e077b7e..727c82e 100644 --- a/audio/comet/aidl_config/mixer_paths_aidl.xml +++ b/audio/comet/aidl_config/mixer_paths_aidl.xml @@ -964,6 +964,8 @@ + + diff --git a/audio/comet/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so b/audio/comet/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so index 2f3a373..861ef15 100644 Binary files a/audio/comet/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so and b/audio/comet/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so differ diff --git a/audio/comet/tuning/apmg3/downlink_handset_config.pb b/audio/comet/tuning/apmg3/downlink_handset_config.pb index 0b622ac..18af1aa 100644 Binary files a/audio/comet/tuning/apmg3/downlink_handset_config.pb and b/audio/comet/tuning/apmg3/downlink_handset_config.pb differ diff --git a/audio/comet/tuning/apmg3/downlink_handset_hac_config.pb b/audio/comet/tuning/apmg3/downlink_handset_hac_config.pb new file mode 100644 index 0000000..327aeb5 Binary files /dev/null and b/audio/comet/tuning/apmg3/downlink_handset_hac_config.pb differ diff --git a/audio/comet/tuning/apmg3/downlink_speaker_config.pb b/audio/comet/tuning/apmg3/downlink_speaker_config.pb index f8cee42..c67bc35 100644 Binary files a/audio/comet/tuning/apmg3/downlink_speaker_config.pb and b/audio/comet/tuning/apmg3/downlink_speaker_config.pb differ diff --git a/audio/comet/tuning/apmg3/uplink_handset_hac_aec_off_config.pb b/audio/comet/tuning/apmg3/uplink_handset_hac_aec_off_config.pb new file mode 100644 index 0000000..2b4edbd Binary files /dev/null and b/audio/comet/tuning/apmg3/uplink_handset_hac_aec_off_config.pb differ diff --git a/audio/comet/tuning/apmg3/uplink_handset_hac_aec_on_config.pb b/audio/comet/tuning/apmg3/uplink_handset_hac_aec_on_config.pb new file mode 100644 index 0000000..2fd9459 Binary files /dev/null and b/audio/comet/tuning/apmg3/uplink_handset_hac_aec_on_config.pb differ diff --git a/audio/comet/tuning/apmg3/uplink_speaker_aec_on_config.pb b/audio/comet/tuning/apmg3/uplink_speaker_aec_on_config.pb index d40e099..45932bb 100644 Binary files a/audio/comet/tuning/apmg3/uplink_speaker_aec_on_config.pb and b/audio/comet/tuning/apmg3/uplink_speaker_aec_on_config.pb differ diff --git a/device-comet.mk b/device-comet.mk index 2198c9e..2354f09 100644 --- a/device-comet.mk +++ b/device-comet.mk @@ -72,7 +72,7 @@ include device/google/comet/audio/comet/audio-tables.mk include device/google/zumapro/device-shipping-common.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/gti/predump_gti_dual.mk -include device/google/gs-common/display/dump_second_display.mk +include device/google/gs-common/display/dump_exynos_second_display.mk include device/google/gs-common/gril/hidl/1.7/gril_hidl.mk # Increment the SVN for any official public releases @@ -197,6 +197,7 @@ PRODUCT_COPY_FILES += \ $(TARGET_VENDOR_THERMAL_CONFIG_PATH)/thermal_info_config_backup_comet.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_backup.json \ $(TARGET_VENDOR_THERMAL_CONFIG_PATH)/vt_estimation_model_comet.tflite:$(TARGET_COPY_OUT_VENDOR)/etc/vt_estimation_model.tflite \ $(TARGET_VENDOR_THERMAL_CONFIG_PATH)/vt_speaker_estimation_model_comet.tflite:$(TARGET_COPY_OUT_VENDOR)/etc/vt_speaker_estimation_model.tflite \ + $(TARGET_VENDOR_THERMAL_CONFIG_PATH)/thermal_info_config_lpm_comet.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_lpm.json \ ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) PRODUCT_COPY_FILES += \ @@ -343,7 +344,8 @@ PRODUCT_SOONG_NAMESPACES += \ # UWB Overlay PRODUCT_PACKAGES += \ - UwbOverlayCT3 + UwbOverlayCT3 \ + UwbOverlayCT3Gsi # WiFi Overlay PRODUCT_PACKAGES += \ @@ -415,8 +417,6 @@ PRODUCT_VENDOR_PROPERTIES += \ # Haptics # Placeholders for updates later, need to update: -# remove ro.vendor.vibrator.hal.dbc.enable (needed for setting pm.activetimeout) -# remove pm.activetimeout # ro.vendor.vibrator.hal.loc.coeff.folded currently unused $(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION))) ACTUATOR_MODEL := luxshare_ict_081545 @@ -426,8 +426,6 @@ PRODUCT_VENDOR_PROPERTIES += \ ro.vendor.vibrator.hal.device.mass=0.2605 \ ro.vendor.vibrator.hal.loc.coeff.folded=3.15 \ ro.vendor.vibrator.hal.loc.coeff=2.58 \ - ro.vendor.vibrator.hal.dbc.enable=1 \ - ro.vendor.vibrator.hal.pm.activetimeout=5 \ persist.vendor.vibrator.hal.context.enable=false \ persist.vendor.vibrator.hal.context.scale=60 \ persist.vendor.vibrator.hal.context.fade=true \ diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index 212c435..3a5e644 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -1,7 +1,7 @@ com.google.hardware.pixel.display - 13 + 13-14 IDisplay secondary diff --git a/location/user/gps.cfg b/location/user/gps.cfg index 0eb555d..8ee0594 100644 --- a/location/user/gps.cfg +++ b/location/user/gps.cfg @@ -23,17 +23,17 @@ ChipCfg_VDR_high_end_Distance = 200 ChipCfg_VDR_low_end_Distance = 200 ChipCfg_VDR_high_end_Time = 20 ChipCfg_VDR_low_end_Time = 20 -Chip_Configuration_AidingConfiguration=0x00020046 +Chip_Configuration_AidingConfiguration=0x000200C6 Chip_Configuration_RefClkControl=0x24 Chip_Configuration_DCXO_CrystalType=0x11 Chip_Configuration_GNSSConstConstraintDef = 0x60FF LocTech_Constraints = 0x60FF Chip_Configuration_RfMiscCtrl = 0x80008001 Chip_Configuration_ntn_option=2 -bdsUsedInUSPolicy=2 -sbasUsedInUSPolicy=2 -qzssUsedInUSPolicy=2 -navicUsedInUSPolicy=2 +bdsUsedPolicy=2 +sbasUsedPolicy=2 +qzssUsedPolicy=2 +navicUsedPolicy=2 Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DFS = 1 Chip_Configuration_FeatureCfg_MTPL = 1 @@ -44,6 +44,8 @@ UseRtcForAiding=1 additional_rtc_uncertainty_ms=10 Sif_UseFwXtraInterface=1 Agnss_IsGloAidingEnable=0 +Agnss_IsGalAidingEnable=0 +Agnss_IsBdsAidingEnable=0 SETCaps_IsOtdoa=1 SETCaps_IsLpp=1 SETCaps_SuplUT1=20 @@ -70,16 +72,20 @@ UP_LocTech_PrimaryConst=0 UP_LocTech_Constraints=1 UP_LocTech_Requirements=0 SpotLogger_Allowed=0 -SingleBandAcqPower=69 -MultiBandAcqPower=90 -SingleBandFullTrkPower=55 -MultiBandFullTrkPower=70 -SingleBandDutyCycleTrkPower=50 -MultiBandDutyCycleTrkPower=65 -SingleBandNmTrkPower=20 -MultiBandNmTrkPower=28 -SingleBandUdTrkPower=14 -MultiBandUdTrkPower=18 +SingleBandAcq=474 +MultiBandAcq=586 +SingleBandFullTrkNm=432 +SingleBandFullTrkUd=390 +MultiBandFullTrkNm=572 +MultiBandFullTrkUd=509 +SingleBandDutyCycleTrkNm=390 +SingleBandDutyCycleTrkUd=355 +MultiBandDutyCycleTrkNm=509 +MultiBandDutyCycleTrkUd=453 +SingleBandVddGnssNmTrk=145 +MultiBandVddGnssNmTrk=187 +SingleBandVddGnssUdTrk=103 +MultiBandVddGnssUdTrk=131 path_delay_glo_12fx_cm = -5070,-5042,-5004,-4986,-4938,-4886,-4829,-4758,-4662,-4578,-4484,-4459,-4436,-4455 path_delay_gps_2fx_cm = 12342 path_delay_bds_4fx_cm = 123 @@ -88,6 +94,7 @@ RfPathLossDb_Ap=3600 RfPathLossDb_Cp=3600 RfPathLossDb_L5_Ap=4300 RfPathLossDb_L5_Cp=4300 +NmeaBitmask=0x010003fff IsUseEntireRespTime911=1 isForceHighAccuracyMode=1 cp_partial_reset_disable=1 @@ -155,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/userdebug/gps.cfg b/location/userdebug/gps.cfg index 28cead2..0eb10b4 100644 --- a/location/userdebug/gps.cfg +++ b/location/userdebug/gps.cfg @@ -62,8 +62,17 @@ ChipCfg_VDR_low_end_Distance = 200 ChipCfg_VDR_high_end_Time = 20 ChipCfg_VDR_low_end_Time = 20 +# 0x01 = Precise time aiding +# 0x02 = Coarse time aiding * +# 0x04 = Local time aiding * +# 0x08 = CP time aiding +# 0x10 = Frequency counter aiding +# 0x20 = Frequency non-counter aiding +# 0x40 = CP Frequency aiding * +# 0x80 = Extend BE collection * +# 0xFFFF0000 Frequency aiding PPM mask (example - 0x00020000 is .2PPM) ### temporarily disable precise time aiding ### -Chip_Configuration_AidingConfiguration=0x00020046 +Chip_Configuration_AidingConfiguration=0x000200C6 # set shared reference clock for freq aiding (0x20) # enable dcxo (0x04) @@ -120,13 +129,15 @@ Chip_Configuration_RfMiscCtrl = 0x80008001 #Chip_Configuration_ntn_option=2 means turning GNSS off during NTN blackout period. Chip_Configuration_ntn_option=2 -# Disable BDS in the U.S. -# 0-enabled (default), 1-disabled, 2-auto(disabled in US) -#gloUsedInUSPolicy=2 -bdsUsedInUSPolicy=2 -sbasUsedInUSPolicy=2 -qzssUsedInUSPolicy=2 -navicUsedInUSPolicy=2 +# Certain constellation permission overriding LocTech config setting: only to possibly +# disallow constellations allowed in LocTech, not vice versa. Note: GPS and GAL are +# allowed in all markets so no such overriding. +# 0: not to override (default), 1-disabled, 2- disabled if in US +#gloUsedPolicy=2 +bdsUsedPolicy=2 +sbasUsedPolicy=2 +qzssUsedPolicy=2 +navicUsedPolicy=2 # DVS: 0 = Disabled, 1 = Enabled (default) # DFS: 0 = Disabled, 1 = Enabled (default) @@ -179,6 +190,8 @@ Sif_UseFwXtraInterface=1 # ChipCfg_GetGpsWeekFloor=0 Agnss_IsGloAidingEnable=0 +Agnss_IsGalAidingEnable=0 +Agnss_IsBdsAidingEnable=0 SETCaps_IsOtdoa=1 SETCaps_IsLpp=1 SETCaps_SuplUT1=20 @@ -213,16 +226,20 @@ UP_LocTech_Requirements=0 SpotLogger_Allowed=0 # GNSS power values in "mW" -SingleBandAcqPower=69 -MultiBandAcqPower=90 -SingleBandFullTrkPower=55 -MultiBandFullTrkPower=70 -SingleBandDutyCycleTrkPower=50 -MultiBandDutyCycleTrkPower=65 -SingleBandNmTrkPower=20 -MultiBandNmTrkPower=28 -SingleBandUdTrkPower=14 -MultiBandUdTrkPower=18 +SingleBandAcq=474 +MultiBandAcq=586 +SingleBandFullTrkNm=432 +SingleBandFullTrkUd=390 +MultiBandFullTrkNm=572 +MultiBandFullTrkUd=509 +SingleBandDutyCycleTrkNm=390 +SingleBandDutyCycleTrkUd=355 +MultiBandDutyCycleTrkNm=509 +MultiBandDutyCycleTrkUd=453 +SingleBandVddGnssNmTrk=145 +MultiBandVddGnssNmTrk=187 +SingleBandVddGnssUdTrk=103 +MultiBandVddGnssUdTrk=131 path_delay_glo_12fx_cm = -5070,-5042,-5004,-4986,-4938,-4886,-4829,-4758,-4662,-4578,-4484,-4459,-4436,-4455 path_delay_gps_2fx_cm = 12342 @@ -318,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 cf97ba9..0000000 --- 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 - 3.0 - - IAudioExt - default - - - - diff --git a/powerhint-comet.json b/powerhint-comet.json index a54a595..0cd0a86 100644 --- a/powerhint-comet.json +++ b/powerhint-comet.json @@ -888,6 +888,26 @@ "ResetOnInit": true, "Type": "Property" }, + { + "Name": "ntc_critical_trip", + "Path": "/dev/thermal/tz-by-name/charger_therm/trip_point_1_temp", + "Values": [ + "64000", + "72000" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "ntc_hot_trip", + "Path": "/dev/thermal/tz-by-name/charger_therm/trip_point_2_temp", + "Values": [ + "66000", + "74000" + ], + "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", @@ -1011,6 +1041,16 @@ ], "DefaultIndex": 0, "ResetOnInit": true + }, + { + "Name": "SYSTEM_UI_ADPF_PROFILES", + "Path": ":SYSTEM_UI", + "Values": [ + "SYSTEM_UI_PROFILE" + ], + "DefaultIndex": 0, + "ResetOnInit": true, + "Type": "Event" } ], "Actions": [ @@ -1351,7 +1391,7 @@ { "PowerHint": "LAUNCH", "Node": "TARampupMultiplier", - "Duration": 0, + "Duration": 5000, "Value": "4" }, { @@ -1447,7 +1487,7 @@ { "PowerHint": "LAUNCH_EXTEND", "Node": "TARampupMultiplier", - "Duration": 0, + "Duration": 2000, "Value": "4" }, { @@ -3204,20 +3244,8 @@ "Value": "1" }, { - "PowerHint": "REFRESH_120FPS", - "Node": "TAUClampBoost", - "Duration": 0, - "Value": "1" - }, - { - "PowerHint": "REFRESH_60FPS", - "Node": "TAUClampBoost", - "Duration": 0, - "Value": "1" - }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Node": "TAUClampBoost", + "PowerHint": "AUTOMOTIVE_PROJECTION", + "Node": "AAModeProperty", "Duration": 0, "Value": "1" }, @@ -3262,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", @@ -3406,6 +3446,18 @@ "Duration": 0, "Value": "1" }, + { + "PowerHint": "THERMAL_ShutdownMode_EMERGENCY", + "Node": "ntc_critical_trip", + "Duration": 0, + "Value": "72000" + }, + { + "PowerHint": "THERMAL_ShutdownMode_EMERGENCY", + "Node": "ntc_hot_trip", + "Duration": 0, + "Value": "74000" + }, { "PowerHint": "GAME", "Node": "PMU_POLL", @@ -3482,13 +3534,15 @@ "PowerHint": "GAME", "Node": "AutoMigrationMarginsEnable", "Duration": 0, - "Value": "1" + "Value": "1", + "EnableProperty": "vendor.powerhal.amm_enabled" }, { "PowerHint": "GAME", "Node": "AutoDvfsHeadroomEnable", "Duration": 0, - "Value": "1" + "Value": "1", + "EnableProperty": "vendor.powerhal.amm_enabled" }, { "PowerHint": "GAME", @@ -3807,6 +3861,18 @@ "Node": "MIFTargetLoad", "Duration": 0, "Value": "20 80" + }, + { + "PowerHint": "DISABLE_AMM", + "Node": "AutoMigrationMarginsEnable", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "DISABLE_AMM", + "Node": "AutoDvfsHeadroomEnable", + "Duration": 0, + "Value": "0" } ], "GpuSysfsPath" : "/sys/devices/platform/1f000000.mali", @@ -3926,79 +3992,42 @@ "GpuCapacityBoostMax": 25000 }, { - "Name": "UiHighBoostWithoutPid", - "PID_On": false, - "PID_Po": 0, - "PID_Pu": 0, - "PID_I": 0, - "PID_I_Init": 0, - "PID_I_High": 0, - "PID_I_Low": 0, - "PID_Do": 0, - "PID_Du": 0, - "SamplingWindow_P": 1, - "SamplingWindow_I": 1, - "SamplingWindow_D": 1, + "Name": "SYSTEM_UI_PROFILE", + "PID_On": true, + "PID_Po": 2.0, + "PID_Pu": 0.5, + "PID_I": 0.0, + "PID_I_Init": 200, + "PID_I_High": 512, + "PID_I_Low": -30, + "PID_Do": 500.0, + "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 250, - "UclampMin_High": 196, - "UclampMin_Low": 196, + "UclampMin_Init": 231, + "UclampMin_LoadUp": 730, + "UclampMin_LoadReset": 730, + "UclampMin_High": 480, + "UclampMin_Low": 2, "UclampMax_EfficientBase": 500, "UclampMax_EfficientOffset": 200, - "ReportingRateLimitNs": 1, - "TargetTimeFactor": 1.0, - "StaleTimeFactor": 5.0, - "GpuBoost": false - }, - { - "Name": "UiLowBoostWithoutPid", - "PID_On": false, - "PID_Po": 0, - "PID_Pu": 0, - "PID_I": 0, - "PID_I_Init": 0, - "PID_I_High": 0, - "PID_I_Low": 0, - "PID_Do": 0, - "PID_Du": 0, "SamplingWindow_P": 1, - "SamplingWindow_I": 1, + "SamplingWindow_I": 0, "SamplingWindow_D": 1, - "UclampMin_On": true, - "UclampMin_Init": 250, - "UclampMin_High": 52, - "UclampMin_Low": 52, - "UclampMax_EfficientBase": 500, - "UclampMax_EfficientOffset": 200, - "ReportingRateLimitNs": 1, + "ReportingRateLimitNs": 166666660, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 5.0, - "GpuBoost": false - }, - { - "Name": "UiLowNoneBoost", - "PID_On": false, - "PID_Po": 0, - "PID_Pu": 0, - "PID_I": 0, - "PID_I_Init": 0, - "PID_I_High": 0, - "PID_I_Low": 0, - "PID_Do": 0, - "PID_Du": 0, - "SamplingWindow_P": 1, - "SamplingWindow_I": 1, - "SamplingWindow_D": 1, - "UclampMin_On": true, - "UclampMin_Init": 250, - "UclampMin_High": 0, - "UclampMin_Low": 0, - "UclampMax_EfficientBase": 500, - "UclampMax_EfficientOffset": 200, - "ReportingRateLimitNs": 1, - "TargetTimeFactor": 1.0, - "StaleTimeFactor": 5.0, - "GpuBoost": false + "StaleTimeFactor": 15.0, + "HeuristicBoost_On": true, + "HBoostModerateJankThreshold": 2, + "HBoostOffMaxAvgDurRatio": 4.0, + "HBoostSevereJankPidPu": 0.3, + "HBoostSevereJankThreshold": 8, + "HBoostUclampMinCeilingRange": [480, 722], + "HBoostUclampMinFloorRange": [230, 410], + "JankCheckTimeFactor": 1.2, + "LowFrameRateThreshold": 25, + "MaxRecordsNum": 300, + "GpuBoost": true, + "GpuCapacityBoostMax": 25000 } ] } diff --git a/rro_overlays/UwbOverlay/Android.bp b/rro_overlays/UwbOverlay/Android.bp index 4b62d84..2aa1d8a 100644 --- a/rro_overlays/UwbOverlay/Android.bp +++ b/rro_overlays/UwbOverlay/Android.bp @@ -14,5 +14,13 @@ runtime_resource_overlay { theme: "UwbOverlayCT3", certificate: "platform", sdk_version: "current", - product_specific: true + product_specific: true, +} + +runtime_resource_overlay { + name: "UwbOverlayCT3Gsi", + theme: "UwbOverlayCT3", + certificate: "platform", + sdk_version: "current", + vendor: true, } diff --git a/thermal/thermal_info_config_comet.json b/thermal/thermal_info_config_comet.json index e08dccd..20ae223 100644 --- a/thermal/thermal_info_config_comet.json +++ b/thermal/thermal_info_config_comet.json @@ -4,6 +4,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_comet.json b/thermal/thermal_info_config_lpm_comet.json new file mode 100644 index 0000000..e60fdfa --- /dev/null +++ b/thermal/thermal_info_config_lpm_comet.json @@ -0,0 +1,81 @@ +{ + "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":[57000.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": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm"], + "Formula":"WEIGHTED_AVG", + "Combination":["VIRTUAL-SKIN"], + "Coefficient":[1.0], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 57.0, "NAN"], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 5.9, 1.9], + "SeverityReference": "battery", + "Multiplier":0.001, + "SendCallback": true, + "SendPowerHint": true, + "PollingDelay":300000, + "PassiveDelay":7000 + }, + { + "Name": "VIRTUAL-SKIN", + "Type": "SKIN", + "Version": "2.3", + "VirtualSensor": true, + "TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm"], + "Formula": "MAXIMUM", + "Combination": ["VIRTUAL-SKIN-LEGACY"], + "Coefficient": [1.0], + "HotThreshold": ["NAN", 39.0, 43.0, 45.0, 46.5, 53.0, 65.0], + "HotHysteresis": [0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], + "SeverityReference": "SkinShutdownModeHighPower", + "Multiplier": 0.001, + "PollingDelay": 300000, + "PassiveDelay": 7000, + "SendCallback": true, + "BindedCdevInfo": [ + { + "CdevRequest": "gxp-cooling", + "LimitInfo": [0, 0, 0, 0, 0, 99, 99] + } + ] + } + ] +}