Merge "thermal: update SKIN shutdown threshold" into tm-qpr-dev am: 99ed8c8b4c

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/20803989

Change-Id: Ida148f3e2c6f7aa176a4172fd9bb0fbc2820b654
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot 2022-12-22 15:22:05 +00:00 committed by Automerger Merge Worker
commit 9f0bfa3458
2 changed files with 18 additions and 18 deletions

View file

@ -244,7 +244,7 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN-CLOSE", "VIRTUAL-SKIN-OPEN"], "Combination":["VIRTUAL-SKIN-CLOSE", "VIRTUAL-SKIN-OPEN"],
"Coefficient":[1.0, 1.0], "Coefficient":[1.0, 1.0],
"HotThreshold":["NAN", 25.0, 41.0, 43.0, 45.0, 47.0, 60.0], "HotThreshold":["NAN", 25.0, 41.0, 43.0, 45.0, 47.0, 54.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":60000, "PollingDelay":60000,

View file

@ -249,7 +249,7 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN-CLOSE", "VIRTUAL-SKIN-OPEN"], "Combination":["VIRTUAL-SKIN-CLOSE", "VIRTUAL-SKIN-OPEN"],
"Coefficient":[1.0, 1.0], "Coefficient":[1.0, 1.0],
"HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 60.0], "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 51.0, 54.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":300000, "PollingDelay":300000,
@ -269,9 +269,9 @@
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"skin_therm", "TriggerSensor":"skin_therm",
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN-CLOSE", "VIRTUAL-SKIN-OPEN"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0, 1.0], "Coefficient":[1.0],
"HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 60.0], "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 51.0, 54.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"SendPowerHint":true, "SendPowerHint":true,
@ -284,9 +284,9 @@
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"skin_therm", "TriggerSensor":"skin_therm",
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN-CLOSE", "VIRTUAL-SKIN-OPEN"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0, 1.0], "Coefficient":[1.0],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 54.0, "NAN"], "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 52.5, "NAN"],
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":300000, "PollingDelay":300000,
@ -300,9 +300,9 @@
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"skin_therm", "TriggerSensor":"skin_therm",
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN-CLOSE", "VIRTUAL-SKIN-OPEN"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0, 1.0], "Coefficient":[1.0],
"HotThreshold":["NAN", 37.0, 39.0, 41.0, 46.5, 52.0, 60.0], "HotThreshold":["NAN", 37.0, 39.0, 41.0, 46.5, 51.0, 54.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":300000, "PollingDelay":300000,
@ -361,9 +361,9 @@
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"skin_therm", "TriggerSensor":"skin_therm",
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN-CLOSE", "VIRTUAL-SKIN-OPEN"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0, 1.0], "Coefficient":[1.0],
"HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 60.0], "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 51.0, 54.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":300000, "PollingDelay":300000,
@ -426,10 +426,10 @@
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"skin_therm", "TriggerSensor":"skin_therm",
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN-CLOSE", "VIRTUAL-SKIN-OPEN"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0, 1.0], "Coefficient":[1.0],
"HotThreshold":["NAN", 25.0, 41.0, 43.0, 45.0, 47.0, 60.0], "HotThreshold":["NAN", 25.0, 41.0, 43.0, 45.0, 46.5, 54.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.4, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":60000, "PollingDelay":60000,
"PassiveDelay":60000, "PassiveDelay":60000,