Merge "Revert "thermal: Update hotThresholds"" into main

This commit is contained in:
Priyanka Advani 2024-02-21 22:16:57 +00:00 committed by Android (Google) Code Review
commit c67b17cf90
2 changed files with 8 additions and 8 deletions

View file

@ -107,7 +107,7 @@
"Combination": ["VIRTUAL-SKIN-CHARGE-OPEN", "VIRTUAL-SKIN-CHARGE-CLOSE"],
"Coefficient": ["OPEN_WEIGHT", "CLOSE_WEIGHT"],
"CoefficientType": ["SENSOR", "SENSOR"],
"HotThreshold": ["NaN", 34.0, 38.0, 41.0, 45.0, 46.5, 57.0],
"HotThreshold": ["NaN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
"HotHysteresis": [0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
"Multiplier": 0.001,
"PollingDelay": 300000,

View file

@ -142,7 +142,7 @@
"Combination": ["VIRTUAL-SKIN-OPEN", "VIRTUAL-SKIN-CLOSE"],
"Coefficient": ["OPEN_WEIGHT", "CLOSE_WEIGHT"],
"CoefficientType": ["SENSOR", "SENSOR"],
"HotThreshold": ["NAN", 39.0, 43.0, 45.0, 46.5, 53.0, 57.0],
"HotThreshold": ["NAN", 39.0, 43.0, 45.0, 46.5, 100.0, 140.0],
"HotHysteresis": [0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier": 0.001,
"PollingDelay": 300000,
@ -168,7 +168,7 @@
"Formula": "MAXIMUM",
"Combination": ["VIRTUAL-SKIN"],
"Coefficient": [1.0],
"HotThreshold": ["NAN", 37.0, 43.0, 45.0, 46.5, 53.0, 57.0],
"HotThreshold": ["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 140.0],
"HotHysteresis": [0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier": 0.001,
"SendPowerHint": true,
@ -327,7 +327,7 @@
"Formula": "MAXIMUM",
"Combination": ["VIRTUAL-SKIN"],
"Coefficient": [1.0],
"HotThreshold": ["NAN", 41.0, 43.0, 53.0, "NAN", "NAN", "NAN"],
"HotThreshold": ["NAN", 41.0, 43.0, 52.0, "NAN", "NAN", "NAN"],
"HotHysteresis": [0.0, 0.0, 1.9, 1.9, 0.0, 0.0, 0.0],
"Multiplier": 0.001,
"PollingDelay": 300000,
@ -430,7 +430,7 @@
"Formula": "MAXIMUM",
"Combination": ["VIRTUAL-SKIN"],
"Coefficient": [1.0],
"HotThreshold": ["NAN", 37.0, 43.0, 45.0, 46.5, 53.0, 57.0],
"HotThreshold": ["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 140.0],
"HotHysteresis": [0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier": 0.001,
"PollingDelay": 300000,
@ -494,7 +494,7 @@
"Formula": "MAXIMUM",
"Combination": ["VIRTUAL-SKIN"],
"Coefficient": [1.0],
"HotThreshold": ["NAN", 43.0, 45.0, 46.5, 53.0, "NAN", "NAN"],
"HotThreshold": ["NAN", 43.0, 45.0, 46.5, 52.0, "NAN", "NAN"],
"HotHysteresis": [0.0, 1.9, 1.9, 1.4, 1.9, 0.0, 0.0],
"Multiplier": 0.001,
"PollingDelay": 300000,
@ -526,7 +526,7 @@
"Formula": "MAXIMUM",
"Combination": ["VIRTUAL-SKIN"],
"Coefficient": [1.0],
"HotThreshold": ["NAN", "NAN", "NAN", "NAN", "NAN", 55.0, "NAN"],
"HotThreshold": ["NAN", "NAN", "NAN", "NAN", "NAN", 138.0, "NAN"],
"HotHysteresis": [0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0],
"Multiplier": 0.001,
"PollingDelay": 300000,
@ -542,7 +542,7 @@
"Formula": "MAXIMUM",
"Combination": ["VIRTUAL-SKIN"],
"Coefficient": [1.0],
"HotThreshold": ["NAN", 34.0, 38.0, 41.0, 45.0, 46.5, 57.0],
"HotThreshold": ["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
"HotHysteresis": [0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
"Multiplier": 0.001,
"PollingDelay": 300000,