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

Merge "thermal: Expose VCharge-Sensors with throttling" into 24D1-dev am: 9883d695b7

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

Change-Id: I3b47327eead7b9e80bc3dbb3d97b7ab2223204a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
S Ashwin Balaji 2024-05-03 07:31:37 +00:00 • committed by Automerger Merge Worker
commit fecfc4f5c0
12 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
thermal/thermal_info_config_caiman.json
View file

@ -957,6 +957,7 @@
"Name":"VIRTUAL-SKIN-CHARGE",
"Type":"UNKNOWN",
"Version":"8.0",
"Hidden":true,
"VirtualSensor":true,
"Formula":"MAXIMUM",
"Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5"],
@ -991,7 +992,6 @@
{
"Name":"VIRTUAL-SKIN-CHARGE-WIRED",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
"Formula":"WEIGHTED_AVG",
@ -1035,7 +1035,6 @@
{
"Name":"VIRTUAL-SKIN-CHARGE-PERSIST",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
"Formula":"WEIGHTED_AVG",

1
thermal/thermal_info_config_caiman_proto.json
View file

@ -689,6 +689,7 @@
"Name":"VIRTUAL-SKIN-CHARGE",
"Type":"UNKNOWN",
"Version":"5.0",
"Hidden":true,
"VirtualSensor":true,
"TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
"Formula":"MAXIMUM",

1
thermal/thermal_info_config_caiman_wingboard.json
View file

@ -788,6 +788,7 @@
"Name":"VIRTUAL-SKIN-CHARGE",
"Type":"UNKNOWN",
"Version":"7.0",
"Hidden":true,
"VirtualSensor":true,
"Formula":"MAXIMUM",
"Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3"],

3
thermal/thermal_info_config_charge_caiman.json
View file

@ -147,6 +147,7 @@
"Name":"VIRTUAL-SKIN-CHARGE",
"Type":"UNKNOWN",
"Version":"8.0",
"Hidden":true,
"VirtualSensor":true,
"Formula":"MAXIMUM",
"Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5"],
@ -181,7 +182,6 @@
{
"Name":"VIRTUAL-SKIN-CHARGE-WIRED",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
"Formula":"WEIGHTED_AVG",
@ -225,7 +225,6 @@
{
"Name":"VIRTUAL-SKIN-CHARGE-PERSIST",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
"Formula":"WEIGHTED_AVG",

3
thermal/thermal_info_config_charge_komodo.json
View file

@ -147,6 +147,7 @@
"Name":"VIRTUAL-SKIN-CHARGE",
"Type":"UNKNOWN",
"Version":"9.0",
"Hidden":true,
"VirtualSensor":true,
"Formula":"MAXIMUM",
"Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5"],
@ -181,7 +182,6 @@
{
"Name":"VIRTUAL-SKIN-CHARGE-WIRED",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
"Formula":"WEIGHTED_AVG",
@ -225,7 +225,6 @@
{
"Name":"VIRTUAL-SKIN-CHARGE-PERSIST",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
"Formula":"WEIGHTED_AVG",

3
thermal/thermal_info_config_charge_tokay.json
View file

@ -147,6 +147,7 @@
"Name":"VIRTUAL-SKIN-CHARGE",
"Type":"UNKNOWN",
"Version":"9.0",
"Hidden":true,
"VirtualSensor":true,
"Formula":"MAXIMUM",
"Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5"],
@ -181,7 +182,6 @@
{
"Name":"VIRTUAL-SKIN-CHARGE-WIRED",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
"Formula":"WEIGHTED_AVG",
@ -225,7 +225,6 @@
{
"Name":"VIRTUAL-SKIN-CHARGE-PERSIST",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
"Formula":"WEIGHTED_AVG",

3
thermal/thermal_info_config_komodo.json
View file

@ -944,6 +944,7 @@
"Name":"VIRTUAL-SKIN-CHARGE",
"Type":"UNKNOWN",
"Version":"9.0",
"Hidden":true,
"VirtualSensor":true,
"Formula":"MAXIMUM",
"Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5"],
@ -978,7 +979,6 @@
{
"Name":"VIRTUAL-SKIN-CHARGE-WIRED",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
"Formula":"WEIGHTED_AVG",
@ -1022,7 +1022,6 @@
{
"Name":"VIRTUAL-SKIN-CHARGE-PERSIST",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
"Formula":"WEIGHTED_AVG",

1
thermal/thermal_info_config_komodo_proto.json
View file

@ -788,6 +788,7 @@
"Name":"VIRTUAL-SKIN-CHARGE",
"Type":"UNKNOWN",
"Version":"5.0",
"Hidden":true,
"VirtualSensor":true,
"TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
"Formula":"MAXIMUM",

1
thermal/thermal_info_config_komodo_wingboard.json
View file

@ -786,6 +786,7 @@
"Name":"VIRTUAL-SKIN-CHARGE",
"Type":"UNKNOWN",
"Version":"8.0",
"Hidden":true,
"VirtualSensor":true,
"Formula":"MAXIMUM",
"Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3"],

3
thermal/thermal_info_config_tokay.json
View file

@ -960,6 +960,7 @@
"Name":"VIRTUAL-SKIN-CHARGE",
"Type":"UNKNOWN",
"Version":"9.0",
"Hidden":true,
"VirtualSensor":true,
"Formula":"MAXIMUM",
"Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5"],
@ -994,7 +995,6 @@
{
"Name":"VIRTUAL-SKIN-CHARGE-WIRED",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
"Formula":"WEIGHTED_AVG",
@ -1038,7 +1038,6 @@
{
"Name":"VIRTUAL-SKIN-CHARGE-PERSIST",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
"Formula":"WEIGHTED_AVG",

1
thermal/thermal_info_config_tokay_proto.json
View file

@ -712,6 +712,7 @@
"Name":"VIRTUAL-SKIN-CHARGE",
"Type":"UNKNOWN",
"Version":"5.0",
"Hidden":true,
"VirtualSensor":true,
"TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
"Formula":"MAXIMUM",

1
thermal/thermal_info_config_tokay_wingboard.json
View file

@ -846,6 +846,7 @@
"Name":"VIRTUAL-SKIN-CHARGE",
"Type":"UNKNOWN",
"Version":"8.0",
"Hidden":true,
"VirtualSensor":true,
"Formula":"MAXIMUM",
"Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5"],