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

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

Change-Id: I84f562b710236040eeb98b680bcb7b0104f1c01c
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:38:23 +00:00 committed by Automerger Merge Worker
commit de859f378e
2 changed files with 18 additions and 3 deletions

View file

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

View file

@ -157,7 +157,7 @@
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["VIRTUAL-SKIN-UNFOLD-SUB1", "IS_UNFOLD"],
"Combination":["VIRTUAL-SKIN-FOLD-SUB1", "IS_UNFOLD"],
"Coefficient":[1.0, -1000000],
"Multiplier":0.001
},
@ -181,7 +181,22 @@
"LimitInfo": [0, 2, 3, 4, 5, 5, 5]
}
]
},
},
{
"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",
"Type":"UNKNOWN",