Evolution-X-Tensor/device_google_felix
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge changes I66a85036,Id45dbc2e into tm-qpr-dev am: e5f0fa4162

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

Change-Id: I2aa51eb77982a3e1b52e1bc6290aebcefbc25040
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot 2022-09-14 12:08:42 +00:00 • committed by Automerger Merge Worker
commit 750ca61e3b
2 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
thermal_info_config_charge_felix.json
View file

@ -151,7 +151,7 @@
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["VIRTUAL-SKIN-UNFOLD-SUB1", "IS_UNFOLD"], "Combination":["VIRTUAL-SKIN-FOLD-SUB1", "IS_UNFOLD"],
"Coefficient":[1.0, -1000000], "Coefficient":[1.0, -1000000],
"Multiplier":0.001 "Multiplier":0.001
}, },

17
thermal_info_config_felix.json
View file

@ -157,7 +157,7 @@
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["VIRTUAL-SKIN-UNFOLD-SUB1", "IS_UNFOLD"], "Combination":["VIRTUAL-SKIN-FOLD-SUB1", "IS_UNFOLD"],
"Coefficient":[1.0, -1000000], "Coefficient":[1.0, -1000000],
"Multiplier":0.001 "Multiplier":0.001
}, },
@ -182,6 +182,21 @@
} }
] ]
}, },
{
"Name":"cellular-emergency",
"Type":"POWER_AMPLIFIER",
"VirtualSensor":true,
"TriggerSensor":"skin_therm",
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN-UNFOLD", "VIRTUAL-SKIN-FOLD"],
"Coefficient":[1.0, 1.0],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 54.0, "NAN"],
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0],
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000,
"SendCallback":true
},
{ {
"Name":"VIRTUAL-SKIN-CPU-GPU", "Name":"VIRTUAL-SKIN-CPU-GPU",
"Type":"UNKNOWN", "Type":"UNKNOWN",