thermal: use disp_therm as trigger sensor am: 5ef5b305af

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

Change-Id: If1f8980990a85543fca7f69e9ccc8ab81afd098a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sayanna Chandula
2023-02-25 18:17:52 +00:00
committed by Automerger Merge Worker
2 changed files with 26 additions and 26 deletions

View File

@@ -135,8 +135,13 @@
{
"Name":"disp_therm",
"Type":"UNKNOWN",
"HotThreshold":["NAN", 30.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
"HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
"TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp",
"Multiplier":0.001
"Multiplier":0.001,
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
},
{
"Name":"soc_therm",
@@ -147,12 +152,7 @@
{
"Name":"quiet_therm",
"Type":"UNKNOWN",
"HotThreshold":["NAN", 31.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
"HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
"TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
"TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp"
},
{
"Name":"VIRTUAL-SKIN-SUB-0",
@@ -257,7 +257,7 @@
"Type":"SKIN",
"Version":"2.0",
"VirtualSensor":true,
"TriggerSensor":"quiet_therm",
"TriggerSensor":"disp_therm",
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2", "VIRTUAL-SKIN-SUB-3", "VIRTUAL-SKIN-SUB-4", "VIRTUAL-SKIN-SUB-5"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
@@ -283,7 +283,7 @@
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"TriggerSensor":"quiet_therm",
"TriggerSensor":"disp_therm",
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0],
@@ -299,7 +299,7 @@
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"TriggerSensor":"quiet_therm",
"TriggerSensor":"disp_therm",
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0],
@@ -355,7 +355,7 @@
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"TriggerSensor":"quiet_therm",
"TriggerSensor":"disp_therm",
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0],
@@ -392,7 +392,7 @@
"Name":"VIRTUAL-SKIN-CHARGE",
"Type":"UNKNOWN",
"VirtualSensor":true,
"TriggerSensor":"quiet_therm",
"TriggerSensor":"disp_therm",
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1"],
"Coefficient":[1.0, 1.0],
@@ -433,7 +433,7 @@
"Name":"cellular-emergency",
"Type":"POWER_AMPLIFIER",
"VirtualSensor":true,
"TriggerSensor":"quiet_therm",
"TriggerSensor":"disp_therm",
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0],

View File

@@ -135,8 +135,13 @@
{
"Name":"disp_therm",
"Type":"UNKNOWN",
"HotThreshold":["NAN", 30.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
"HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
"TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp",
"Multiplier":0.001
"Multiplier":0.001,
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
},
{
"Name":"soc_therm",
@@ -147,12 +152,7 @@
{
"Name":"quiet_therm",
"Type":"UNKNOWN",
"HotThreshold":["NAN", 31.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
"HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
"TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
"TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp"
},
{
"Name":"VIRTUAL-SKIN-SUB-0",
@@ -269,7 +269,7 @@
"Type":"SKIN",
"Version":"1.0",
"VirtualSensor":true,
"TriggerSensor":"quiet_therm",
"TriggerSensor":"disp_therm",
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2", "VIRTUAL-SKIN-SUB-3", "VIRTUAL-SKIN-SUB-4", "VIRTUAL-SKIN-SUB-5", "VIRTUAL-SKIN-SUB-6", "VIRTUAL-SKIN-SUB-7"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
@@ -295,7 +295,7 @@
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"TriggerSensor":"quiet_therm",
"TriggerSensor":"disp_therm",
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0],
@@ -311,7 +311,7 @@
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"TriggerSensor":"quiet_therm",
"TriggerSensor":"disp_therm",
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0],
@@ -367,7 +367,7 @@
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"TriggerSensor":"quiet_therm",
"TriggerSensor":"disp_therm",
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0],
@@ -404,7 +404,7 @@
"Name":"VIRTUAL-SKIN-CHARGE",
"Type":"UNKNOWN",
"VirtualSensor":true,
"TriggerSensor":"quiet_therm",
"TriggerSensor":"disp_therm",
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1"],
"Coefficient":[1.0, 1.0],
@@ -445,7 +445,7 @@
"Name":"cellular-emergency",
"Type":"POWER_AMPLIFIER",
"VirtualSensor":true,
"TriggerSensor":"quiet_therm",
"TriggerSensor":"disp_therm",
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0],