commit 76637333dbb5dca098cc4310eb97924f9649b448
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon May 15 02:05:55 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon May 15 02:05:55 2023 +0000
tree 05e9ba221c60b424684b8117ca0a9d829736c08c
parent 561c92c418628904c9abe5c62223386c17197a0d
parent d0d3317238960078eabb1118d5b546692b237875

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23048298'] into tm-qpr3-c-release.

Change-Id: Id53f7fdca63df3b038de1b47aeb7aa728725ebbb

thermal_info_config_charge_felix.json

diff --git a/thermal_info_config_charge_felix.json b/thermal_info_config_charge_felix.json
index fc256cf..ca67d3d 100644
--- a/thermal_info_config_charge_felix.json
+++ b/thermal_info_config_charge_felix.json
@@ -80,7 +80,7 @@
             "Multiplier":1
         },
         {
-            "Name":"CLOSE-SUB1",
+            "Name":"CLOSE-SUB1-RAW",
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
@@ -91,6 +91,16 @@
             "Multiplier":0.001
         },
         {
+            "Name":"CLOSE-SUB1",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"MINIMUM",
+            "Combination":["CLOSE-SUB1-RAW", "IS_CLOSE"],
+            "Coefficient":[1.0, 49000.0],
+            "Multiplier":0.001
+        },
+        {
             "Name":"CLOSE-SUB2",
             "Type":"UNKNOWN",
             "Hidden":true,

thermal_info_config_felix.json

diff --git a/thermal_info_config_felix.json b/thermal_info_config_felix.json
index 3920569..775e60f 100644
--- a/thermal_info_config_felix.json
+++ b/thermal_info_config_felix.json
@@ -86,7 +86,7 @@
             "Multiplier":1
         },
         {
-            "Name":"CLOSE-SUB1",
+            "Name":"CLOSE-SUB1-RAW",
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
@@ -97,6 +97,16 @@
             "Multiplier":0.001
         },
         {
+            "Name":"CLOSE-SUB1",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"MINIMUM",
+            "Combination":["CLOSE-SUB1-RAW", "IS_CLOSE"],
+            "Coefficient":[1.0, 49000.0],
+            "Multiplier":0.001
+        },
+        {
             "Name":"CLOSE-SUB2",
             "Type":"UNKNOWN",
             "Hidden":true,

thermal_info_config_proactive_skin_felix.json

diff --git a/thermal_info_config_proactive_skin_felix.json b/thermal_info_config_proactive_skin_felix.json
index 32e4176..bd7b388 100644
--- a/thermal_info_config_proactive_skin_felix.json
+++ b/thermal_info_config_proactive_skin_felix.json
@@ -86,7 +86,7 @@
             "Multiplier":1
         },
         {
-            "Name":"CLOSE-SUB1",
+            "Name":"CLOSE-SUB1-RAW",
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
@@ -97,6 +97,16 @@
             "Multiplier":0.001
         },
         {
+            "Name":"CLOSE-SUB1",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"MINIMUM",
+            "Combination":["CLOSE-SUB1-RAW", "IS_CLOSE"],
+            "Coefficient":[1.0, 49000.0],
+            "Multiplier":0.001
+        },
+        {
             "Name":"CLOSE-SUB2",
             "Type":"UNKNOWN",
             "Hidden":true,