From b5ddd964d3fa3fc5460efce54e616c56fc53028b Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Fri, 1 Apr 2022 18:47:27 +0800 Subject: [PATCH] thermal: Hide the sensors which are not used by framework Bug: 227686549 Test: adb shell dumpsys thermalservice Change-Id: Ib443248437ca38580a3d6eba88bdc831f9515e6a --- thermal_info_config_oriole.json | 28 ++++++++++++++++++---------- thermal_info_config_raven.json | 29 ++++++++++++++++++----------- 2 files changed, 36 insertions(+), 21 deletions(-) diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json index 0594f53..6da4f20 100644 --- a/thermal_info_config_oriole.json +++ b/thermal_info_config_oriole.json @@ -182,6 +182,7 @@ { "Name":"VIRTUAL-QI-GNSS", "Type":"UNKNOWN", + "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", "Combination":[ @@ -208,6 +209,7 @@ { "Name":"VIRTUAL-QI-QUIET", "Type":"UNKNOWN", + "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", "Combination":[ @@ -233,6 +235,7 @@ { "Name":"VIRTUAL-QI-BATT", "Type":"UNKNOWN", + "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", "Combination":[ @@ -259,6 +262,7 @@ { "Name":"VIRTUAL-USB2-DISP", "Type":"UNKNOWN", + "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", "Combination":[ @@ -285,6 +289,7 @@ { "Name":"VIRTUAL-QUIET-BATT", "Type":"UNKNOWN", + "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", "Combination":[ @@ -407,6 +412,7 @@ { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", + "Hidden":true, "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", @@ -442,7 +448,6 @@ ], "VrThreshold":"NAN", "Multiplier":0.001, - "Monitor":true, "PollingDelay":300000, "PassiveDelay":7000, "BindedCdevInfo": [ @@ -520,6 +525,7 @@ { "Name":"USB2-MINUS-USB", "Type":"UNKNOWN", + "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", "Combination":[ @@ -545,6 +551,7 @@ { "Name":"USB2-MINUS-QI", "Type":"UNKNOWN", + "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", "Combination":[ @@ -570,6 +577,7 @@ { "Name":"VIRTUAL-USB-THROTTLING", "Type":"USB_PORT", + "Hidden":true, "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", "TriggerSensor": "usb_pwr_therm2", @@ -783,7 +791,7 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"batoilo", @@ -964,7 +972,7 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"ocp_cpu2", @@ -989,7 +997,7 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"ocp_tpu", @@ -1014,7 +1022,7 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"ocp_gpu", @@ -1039,7 +1047,7 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"soft_ocp_cpu2", @@ -1064,7 +1072,7 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"soft_ocp_cpu1", @@ -1089,7 +1097,7 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"soft_ocp_tpu", @@ -1114,7 +1122,7 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"soft_ocp_gpu", @@ -1139,7 +1147,7 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"TPU", diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json index bc4ebd9..7448099 100644 --- a/thermal_info_config_raven.json +++ b/thermal_info_config_raven.json @@ -182,6 +182,7 @@ { "Name":"VIRTUAL-NEUTRAL-QI", "Type":"UNKNOWN", + "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", "Combination":[ @@ -208,6 +209,7 @@ { "Name":"VIRTUAL-USB2-BATT", "Type":"UNKNOWN", + "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", "Combination":[ @@ -234,6 +236,7 @@ { "Name":"VIRTUAL-GNSS-BATT", "Type":"UNKNOWN", + "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", "Combination":[ @@ -260,6 +263,7 @@ { "Name":"VIRTUAL-QI-DISP", "Type":"UNKNOWN", + "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", "Combination":[ @@ -382,6 +386,7 @@ { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", + "Hidden":true, "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", @@ -417,7 +422,6 @@ ], "VrThreshold":"NAN", "Multiplier":0.001, - "Monitor":true, "PollingDelay":300000, "PassiveDelay":7000, "BindedCdevInfo": [ @@ -495,6 +499,7 @@ { "Name":"USB2-MINUS-USB", "Type":"UNKNOWN", + "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", "Combination":[ @@ -520,6 +525,7 @@ { "Name":"USB2-MINUS-QI", "Type":"UNKNOWN", + "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", "Combination":[ @@ -545,6 +551,7 @@ { "Name":"VIRTUAL-USB-THROTTLING", "Type":"USB_PORT", + "Hidden":true, "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", "TriggerSensor": "usb_pwr_therm2", @@ -758,7 +765,7 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"batoilo", @@ -938,8 +945,8 @@ 0.0 ], "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true + "Multiplier":1 + "Hidden":true, }, { "Name":"ocp_cpu2", @@ -964,7 +971,7 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"ocp_tpu", @@ -989,7 +996,7 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"ocp_gpu", @@ -1014,7 +1021,7 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"soft_ocp_cpu2", @@ -1039,7 +1046,7 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"soft_ocp_cpu1", @@ -1064,7 +1071,7 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"soft_ocp_tpu", @@ -1089,7 +1096,7 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"soft_ocp_gpu", @@ -1114,7 +1121,7 @@ ], "VrThreshold":"NAN", "Multiplier":1, - "Monitor":true + "Hidden":true }, { "Name":"TPU",