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

Merge "thermal: refer inner display brightness for VSKIN equation" into tm-qpr-dev am: 28ba1240c5 am: 083ffcc02a

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

Change-Id: Ia8dddec2140eadde0ff244ba01069d7a28a5b3cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot 2022-12-30 09:32:25 +00:00 • committed by Automerger Merge Worker
commit f7d8f1764f
3 changed files with 18 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

17
thermal_info_config_charge_felix.json
View file

@ -55,14 +55,9 @@
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"VIRTUAL-SKIN-OUTER-INNER", "Name":"inner-disp",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Multiplier":1
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["outer_disp_therm", "inner_disp_therm"],
"Coefficient":[2.5, -1.0],
"Multiplier":0.001
}, },
{ {
"Name":"IS_OPEN", "Name":"IS_OPEN",
@ -70,8 +65,8 @@
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"COUNT_THRESHOLD", "Formula":"COUNT_THRESHOLD",
"Combination":["VIRTUAL-SKIN-OUTER-INNER"], "Combination":["inner-disp"],
"Coefficient":[-40000.0], "Coefficient":[1.0],
"Multiplier":1 "Multiplier":1
}, },
{ {
@ -80,8 +75,8 @@
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"COUNT_THRESHOLD", "Formula":"COUNT_THRESHOLD",
"Combination":["VIRTUAL-SKIN-OUTER-INNER"], "Combination":["inner-disp"],
"Coefficient":[40000.0], "Coefficient":[-1.0],
"Multiplier":1 "Multiplier":1
}, },
{ {

17
thermal_info_config_felix.json
View file

@ -61,14 +61,9 @@
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"VIRTUAL-SKIN-OUTER-INNER", "Name":"inner-disp",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Multiplier":1
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["outer_disp_therm", "inner_disp_therm"],
"Coefficient":[2.5, -1.0],
"Multiplier":0.001
}, },
{ {
"Name":"IS_OPEN", "Name":"IS_OPEN",
@ -76,8 +71,8 @@
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"COUNT_THRESHOLD", "Formula":"COUNT_THRESHOLD",
"Combination":["VIRTUAL-SKIN-OUTER-INNER"], "Combination":["inner-disp"],
"Coefficient":[-40000.0], "Coefficient":[1.0],
"Multiplier":1 "Multiplier":1
}, },
{ {
@ -86,8 +81,8 @@
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"COUNT_THRESHOLD", "Formula":"COUNT_THRESHOLD",
"Combination":["VIRTUAL-SKIN-OUTER-INNER"], "Combination":["inner-disp"],
"Coefficient":[40000.0], "Coefficient":[-1.0],
"Multiplier":1 "Multiplier":1
}, },
{ {

17
thermal_info_config_proactive_skin_felix.json
View file

@ -61,14 +61,9 @@
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"VIRTUAL-SKIN-OUTER-INNER", "Name":"inner-disp",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Multiplier":1
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["outer_disp_therm", "inner_disp_therm"],
"Coefficient":[2.5, -1.0],
"Multiplier":0.001
}, },
{ {
"Name":"IS_OPEN", "Name":"IS_OPEN",
@ -76,8 +71,8 @@
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"COUNT_THRESHOLD", "Formula":"COUNT_THRESHOLD",
"Combination":["VIRTUAL-SKIN-OUTER-INNER"], "Combination":["inner-disp"],
"Coefficient":[-40000.0], "Coefficient":[1.0],
"Multiplier":1 "Multiplier":1
}, },
{ {
@ -86,8 +81,8 @@
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"COUNT_THRESHOLD", "Formula":"COUNT_THRESHOLD",
"Combination":["VIRTUAL-SKIN-OUTER-INNER"], "Combination":["inner-disp"],
"Coefficient":[40000.0], "Coefficient":[-1.0],
"Multiplier":1 "Multiplier":1
}, },
{ {