From deaa89eb2459cafaae8f291501992f6c47a84f02 Mon Sep 17 00:00:00 2001
From: TeYuan Wang <kamewang@google.com>
Date: Fri, 1 Apr 2022 18:21:39 +0800
Subject: [PATCH] thermal: Hide the sensors which are not used by framework

Bug: 227686549
Test: adb shell dumpsys thermalservice
Change-Id: I26e16c664ac95264d0d4cc943bb45627ff774d8c
---
 thermal_info_config_cheetah.json | 27 ++++++++++++++++-----------
 thermal_info_config_panther.json | 25 +++++++++++++++----------
 2 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json
index 1c7ff13..c2df4a9 100644
--- a/thermal_info_config_cheetah.json
+++ b/thermal_info_config_cheetah.json
@@ -152,6 +152,7 @@
         {
             "Name":"VIRTUAL-GNSS-DISP",
             "Type":"UNKNOWN",
+            "Hidden":true,
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":[
@@ -178,6 +179,7 @@
         {
             "Name":"VIRTUAL-USB2-QUIET",
             "Type":"UNKNOWN",
+            "Hidden":true,
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":[
@@ -204,6 +206,7 @@
         {
             "Name":"VIRTUAL-QUIET-USB2",
             "Type":"UNKNOWN",
+            "Hidden":true,
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":[
@@ -230,6 +233,7 @@
         {
             "Name":"VIRTUAL-NEUTRAL-QUIET",
             "Type":"UNKNOWN",
+            "Hidden":true,
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":[
@@ -256,6 +260,7 @@
         {
             "Name":"VIRTUAL-NEUTRAL-USB",
             "Type":"UNKNOWN",
+            "Hidden":true,
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":[
@@ -625,7 +630,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                11500,
+                13000,
                 "NAN",
                 "NAN"
             ],
@@ -723,7 +728,7 @@
             ],
             "Coefficient":[
                 "5000",
-                "10500",
+                "12000",
                 "-1000"
             ],
             "HotThreshold":[
@@ -792,7 +797,7 @@
             ],
             "Coefficient":[
                 "5000",
-                "10500"
+                "12000"
             ],
             "HotThreshold":[
                 "NAN",
@@ -1001,7 +1006,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                7000,
+                8000,
                 "NAN",
                 "NAN"
             ],
@@ -1016,7 +1021,7 @@
             ],
             "VrThreshold":"NAN",
             "Multiplier":1,
-            "Monitor":true
+            "Hidden":true
         },
         {
             "Name":"ocp_cpu2",
@@ -1041,7 +1046,7 @@
             ],
             "VrThreshold":"NAN",
             "Multiplier":1,
-            "Monitor":true
+            "Hidden":true
         },
         {
             "Name":"ocp_tpu",
@@ -1051,7 +1056,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                10500,
+                12000,
                 "NAN",
                 "NAN"
             ],
@@ -1126,7 +1131,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                7000,
+                8000,
                 "NAN",
                 "NAN"
             ],
@@ -1141,7 +1146,7 @@
             ],
             "VrThreshold":"NAN",
             "Multiplier":1,
-            "Monitor":true
+            "Hidden":true
         },
         {
             "Name":"soft_ocp_tpu",
@@ -1166,7 +1171,7 @@
             ],
             "VrThreshold":"NAN",
             "Multiplier":1,
-            "Monitor":true
+            "Hidden":true
         },
         {
             "Name":"soft_ocp_gpu",
@@ -1191,7 +1196,7 @@
             ],
             "VrThreshold":"NAN",
             "Multiplier":1,
-            "Monitor":true
+            "Hidden":true
         },
         {
             "Name":"TPU",
diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json
index 54cabbc..b64e11f 100644
--- a/thermal_info_config_panther.json
+++ b/thermal_info_config_panther.json
@@ -152,6 +152,7 @@
         {
             "Name":"VIRTUAL-QUIET-USB",
             "Type":"UNKNOWN",
+            "Hidden":true,
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":[
@@ -178,6 +179,7 @@
         {
             "Name":"VIRTUAL-USB-QUIET",
             "Type":"UNKNOWN",
+            "Hidden":true,
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":[
@@ -204,6 +206,7 @@
         {
             "Name":"VIRTUAL-GNSS-DISP",
             "Type":"UNKNOWN",
+            "Hidden":true,
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":[
@@ -230,6 +233,7 @@
         {
             "Name":"VIRTUAL-NEUTRAL-QUIET",
             "Type":"UNKNOWN",
+            "Hidden":true,
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":[
@@ -256,6 +260,7 @@
         {
             "Name":"VIRTUAL-NEUTRAL-USB",
             "Type":"UNKNOWN",
+            "Hidden":true,
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":[
@@ -625,7 +630,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                11500,
+                13000,
                 "NAN",
                 "NAN"
             ],
@@ -723,7 +728,7 @@
             ],
             "Coefficient":[
                 "5000",
-                "10500",
+                "12000",
                 "-1000"
             ],
             "HotThreshold":[
@@ -792,7 +797,7 @@
             ],
             "Coefficient":[
                 "5000",
-                "10500"
+                "12000"
             ],
             "HotThreshold":[
                 "NAN",
@@ -1001,7 +1006,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                7000,
+                8000,
                 "NAN",
                 "NAN"
             ],
@@ -1016,7 +1021,7 @@
             ],
             "VrThreshold":"NAN",
             "Multiplier":1,
-            "Monitor":true
+            "Hidden":true
         },
         {
             "Name":"ocp_cpu2",
@@ -1041,7 +1046,7 @@
             ],
             "VrThreshold":"NAN",
             "Multiplier":1,
-            "Monitor":true
+            "Hidden":true
         },
         {
             "Name":"ocp_tpu",
@@ -1051,7 +1056,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                10500,
+                12000,
                 "NAN",
                 "NAN"
             ],
@@ -1126,7 +1131,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                7000,
+                8000,
                 "NAN",
                 "NAN"
             ],
@@ -1166,7 +1171,7 @@
             ],
             "VrThreshold":"NAN",
             "Multiplier":1,
-            "Monitor":true
+            "Hidden":true
         },
         {
             "Name":"soft_ocp_gpu",
@@ -1191,7 +1196,7 @@
             ],
             "VrThreshold":"NAN",
             "Multiplier":1,
-            "Monitor":true
+            "Hidden":true
         },
         {
             "Name":"TPU",