Merge "thermal: more aggressive charging throttling" into tm-qpr-dev am: 165b83b795 am: e134b66c03

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

Change-Id: I2c391fcf5ca24f0d988b906f8fd1579dbb2e0ead
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot 2023-02-16 12:22:42 +00:00 committed by Automerger Merge Worker
commit 3b93a7bd4f
3 changed files with 12 additions and 9 deletions

View file

@ -250,7 +250,7 @@
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN-CLOSE", "VIRTUAL-SKIN-OPEN"],
"Coefficient":[1.0, 1.0],
"HotThreshold":["NAN", 25.0, 41.0, 43.0, 45.0, 46.5, 54.0],
"HotThreshold":["NAN", 25.0, 39.0, 41.0, 45.0, 46.5, 54.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.4, 1.9],
"Multiplier":0.001,
"PollingDelay":60000,
@ -261,10 +261,11 @@
"K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", 1500, "NAN", "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", 4500, "NAN", "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", 3500, "NAN", "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
"MaxAllocPower":["NAN", "NAN", 10000, "NAN", "NAN", "NAN", "NAN"],
"I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"]
"I_Cutoff":["NAN", "NAN", 14, "NAN", "NAN", "NAN", "NAN"],
"I_Default":1000
},
"ExcludedPowerInfo": [
{

View file

@ -438,7 +438,7 @@
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0],
"HotThreshold":["NAN", 25.0, 41.0, 43.0, 45.0, 46.5, 54.0],
"HotThreshold":["NAN", 25.0, 39.0, 41.0, 45.0, 46.5, 54.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.4, 1.9],
"Multiplier":0.001,
"PollingDelay":60000,
@ -449,10 +449,11 @@
"K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", 1500, "NAN", "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", 4500, "NAN", "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", 3500, "NAN", "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
"MaxAllocPower":["NAN", "NAN", 10000, "NAN", "NAN", "NAN", "NAN"],
"I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"]
"I_Cutoff":["NAN", "NAN", 14, "NAN", "NAN", "NAN", "NAN"],
"I_Default":1000
},
"ExcludedPowerInfo": [
{

View file

@ -438,7 +438,7 @@
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0],
"HotThreshold":["NAN", 25.0, 41.0, 43.0, 45.0, 46.5, 54.0],
"HotThreshold":["NAN", 25.0, 39.0, 41.0, 45.0, 46.5, 54.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.4, 1.9],
"Multiplier":0.001,
"PollingDelay":60000,
@ -449,10 +449,11 @@
"K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", 1500, "NAN", "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", 4500, "NAN", "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", 3500, "NAN", "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
"MaxAllocPower":["NAN", "NAN", 10000, "NAN", "NAN", "NAN", "NAN"],
"I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"]
"I_Cutoff":["NAN", "NAN", 14, "NAN", "NAN", "NAN", "NAN"],
"I_Default":1000
},
"ExcludedPowerInfo": [
{