From 77bd92b57d3dc79652728b6f7bd8927b8e8fb599 Mon Sep 17 00:00:00 2001 From: sashwinbalaji Date: Tue, 30 Apr 2024 20:42:52 +0800 Subject: [PATCH] thermal: Expose VCharge-Sensors with throttling Expose virtual charge sensors to which throttling is binded to and hide those which don't have. Unhide: - VIRTUAL-SKIN-CHARGE-WIRED - VIRTUAL-SKIN-CHARGE-PERSIST Hide: - VIRTUAL-SKIN-CHARGE Bug: 336193005 Test: Verify dumpsys Change-Id: I4d83f6af17fccb7de8d053c9d981163c9dde0ea3 --- thermal/thermal_info_config_caiman.json | 3 +-- thermal/thermal_info_config_caiman_proto.json | 1 + thermal/thermal_info_config_caiman_wingboard.json | 1 + thermal/thermal_info_config_charge_caiman.json | 3 +-- thermal/thermal_info_config_charge_komodo.json | 3 +-- thermal/thermal_info_config_charge_tokay.json | 3 +-- thermal/thermal_info_config_komodo.json | 3 +-- thermal/thermal_info_config_komodo_proto.json | 1 + thermal/thermal_info_config_komodo_wingboard.json | 1 + thermal/thermal_info_config_tokay.json | 3 +-- thermal/thermal_info_config_tokay_proto.json | 1 + thermal/thermal_info_config_tokay_wingboard.json | 1 + 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/thermal/thermal_info_config_caiman.json b/thermal/thermal_info_config_caiman.json index 165041b7..36846c91 100644 --- a/thermal/thermal_info_config_caiman.json +++ b/thermal/thermal_info_config_caiman.json @@ -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", diff --git a/thermal/thermal_info_config_caiman_proto.json b/thermal/thermal_info_config_caiman_proto.json index 9270502b..5c1b193d 100644 --- a/thermal/thermal_info_config_caiman_proto.json +++ b/thermal/thermal_info_config_caiman_proto.json @@ -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", diff --git a/thermal/thermal_info_config_caiman_wingboard.json b/thermal/thermal_info_config_caiman_wingboard.json index 70a4c95b..ae8e9be3 100644 --- a/thermal/thermal_info_config_caiman_wingboard.json +++ b/thermal/thermal_info_config_caiman_wingboard.json @@ -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"], diff --git a/thermal/thermal_info_config_charge_caiman.json b/thermal/thermal_info_config_charge_caiman.json index c2e1085f..0a10d088 100644 --- a/thermal/thermal_info_config_charge_caiman.json +++ b/thermal/thermal_info_config_charge_caiman.json @@ -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", diff --git a/thermal/thermal_info_config_charge_komodo.json b/thermal/thermal_info_config_charge_komodo.json index bc26f4fb..37ccb2dc 100644 --- a/thermal/thermal_info_config_charge_komodo.json +++ b/thermal/thermal_info_config_charge_komodo.json @@ -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", diff --git a/thermal/thermal_info_config_charge_tokay.json b/thermal/thermal_info_config_charge_tokay.json index 621fae2f..459a8175 100644 --- a/thermal/thermal_info_config_charge_tokay.json +++ b/thermal/thermal_info_config_charge_tokay.json @@ -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", diff --git a/thermal/thermal_info_config_komodo.json b/thermal/thermal_info_config_komodo.json index 718e01be..dd826145 100644 --- a/thermal/thermal_info_config_komodo.json +++ b/thermal/thermal_info_config_komodo.json @@ -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", diff --git a/thermal/thermal_info_config_komodo_proto.json b/thermal/thermal_info_config_komodo_proto.json index 3fbc17aa..1261a0f8 100644 --- a/thermal/thermal_info_config_komodo_proto.json +++ b/thermal/thermal_info_config_komodo_proto.json @@ -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", diff --git a/thermal/thermal_info_config_komodo_wingboard.json b/thermal/thermal_info_config_komodo_wingboard.json index 796bf3de..6d5a5117 100644 --- a/thermal/thermal_info_config_komodo_wingboard.json +++ b/thermal/thermal_info_config_komodo_wingboard.json @@ -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"], diff --git a/thermal/thermal_info_config_tokay.json b/thermal/thermal_info_config_tokay.json index 601e7f26..95adfa34 100644 --- a/thermal/thermal_info_config_tokay.json +++ b/thermal/thermal_info_config_tokay.json @@ -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", diff --git a/thermal/thermal_info_config_tokay_proto.json b/thermal/thermal_info_config_tokay_proto.json index e47d586c..4f0d652b 100644 --- a/thermal/thermal_info_config_tokay_proto.json +++ b/thermal/thermal_info_config_tokay_proto.json @@ -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", diff --git a/thermal/thermal_info_config_tokay_wingboard.json b/thermal/thermal_info_config_tokay_wingboard.json index a1439470..f3379e3d 100644 --- a/thermal/thermal_info_config_tokay_wingboard.json +++ b/thermal/thermal_info_config_tokay_wingboard.json @@ -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"],