Merge cherrypicks of ['googleplex-android-review.googlesource.com/29895187'] into 25D4-release.

Change-Id: I5bc219227b1561b26ec5172b4259446b2b655587
This commit is contained in:
Android Build Coastguard Worker 2024-11-10 09:10:06 +00:00
commit 2d4158e705

View file

@ -300,6 +300,17 @@
"StepRatio": 0.4,
"PassiveDelay": 7000
},
{
"Name": "CPU_THROTTLE_SEVERE",
"Type": "UNKNOWN",
"VirtualSensor": true,
"Formula": "COUNT_THRESHOLD",
"Combination": ["thermal-cpufreq-0", "thermal-cpufreq-1", "thermal-cpufreq-2"],
"CombinationType": ["CDEV", "CDEV", "CDEV"],
"Coefficient": [7.0, 10.0, 17.0],
"HotThreshold": ["NAN", "NaN", "NaN", "3", "NaN", "NaN", "NaN"],
"HotHysteresis": [0.0, 0.0, 0.0, 1.9, 0.0, 0.0, 0.0]
},
{
"Name":"VIRTUAL-SKIN",
"Type":"SKIN",
@ -314,6 +325,7 @@
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier":0.001,
"SendCallback":true,
"SeverityReference": "CPU_THROTTLE_SEVERE",
"PollingDelay":300000,
"PassiveDelay":7000,
"BindedCdevInfo": [
@ -983,6 +995,21 @@
"PollingDelay":300000,
"PassiveDelay":7000
},
{
"Name": "VIRTUAL-SKIN-DISPLAY",
"Type": "DISPLAY",
"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"],
"Coefficient": [1.0],
"HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier": 0.001,
"SendCallback": true,
"PollingDelay": 300000,
"PassiveDelay": 7000
},
{
"Name":"VSKIN-SKIN-UNDER-52",
"Type":"UNKNOWN",
@ -1407,6 +1434,10 @@
"Name": "EXTREME-SOC-CONDITION-CHECK",
"Thresholds": [0, 3]
},
{
"Name": "CPU_THROTTLE_SEVERE",
"Thresholds": [0, 3]
},
{
"Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF",
"LoggingName": "MODEL-LEGACY-0.5",