From 27929b9fbef1aaba2d4bac9e809eb9fb33c34e5e Mon Sep 17 00:00:00 2001
From: TeYuan Wang <kamewang@google.com>
Date: Wed, 14 Sep 2022 17:44:33 +0800
Subject: [PATCH 1/2] thermal: correct the typo for sensor equation of fold
 mode

Bug: 236787614
Test: emul_temp VIRTUAL-SKIN to EMERGENCY and monitor overheat warning
message

Change-Id: Id45dbc2e7989b9c854f8b4f241d891a76b39cf34
---
 thermal_info_config_charge_felix.json | 2 +-
 thermal_info_config_felix.json        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/thermal_info_config_charge_felix.json b/thermal_info_config_charge_felix.json
index 637e1fb..a9fd6eb 100644
--- a/thermal_info_config_charge_felix.json
+++ b/thermal_info_config_charge_felix.json
@@ -151,7 +151,7 @@
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
-            "Combination":["VIRTUAL-SKIN-UNFOLD-SUB1", "IS_UNFOLD"],
+            "Combination":["VIRTUAL-SKIN-FOLD-SUB1", "IS_UNFOLD"],
             "Coefficient":[1.0, -1000000],
             "Multiplier":0.001
         },
diff --git a/thermal_info_config_felix.json b/thermal_info_config_felix.json
index 7b7bbc1..67db4c7 100644
--- a/thermal_info_config_felix.json
+++ b/thermal_info_config_felix.json
@@ -157,7 +157,7 @@
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
-            "Combination":["VIRTUAL-SKIN-UNFOLD-SUB1", "IS_UNFOLD"],
+            "Combination":["VIRTUAL-SKIN-FOLD-SUB1", "IS_UNFOLD"],
             "Coefficient":[1.0, -1000000],
             "Multiplier":0.001
         },
@@ -181,7 +181,7 @@
                     "LimitInfo": [0, 2, 3, 4, 5, 5, 5]
                 }
             ]
-        },
+       },
        {
             "Name":"VIRTUAL-SKIN-CPU-GPU",
             "Type":"UNKNOWN",

From 8f47b098aad470b16a5cb0a2b31eda46047f7171 Mon Sep 17 00:00:00 2001
From: TeYuan Wang <kamewang@google.com>
Date: Wed, 14 Sep 2022 17:54:18 +0800
Subject: [PATCH 2/2] thermal: add cellular-emergency policy

Bug: 244114302
Test: emul_temp and check thermal event log
Change-Id: I66a8503673cad943e7bd8fc86d88cb84f71b5022
---
 thermal_info_config_felix.json | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/thermal_info_config_felix.json b/thermal_info_config_felix.json
index 67db4c7..347463a 100644
--- a/thermal_info_config_felix.json
+++ b/thermal_info_config_felix.json
@@ -182,6 +182,21 @@
                 }
             ]
        },
+       {
+            "Name":"cellular-emergency",
+            "Type":"POWER_AMPLIFIER",
+            "VirtualSensor":true,
+            "TriggerSensor":"skin_therm",
+            "Formula":"MAXIMUM",
+            "Combination":["VIRTUAL-SKIN-UNFOLD", "VIRTUAL-SKIN-FOLD"],
+            "Coefficient":[1.0, 1.0],
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 54.0, "NAN"],
+            "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0],
+            "Multiplier":0.001,
+            "PollingDelay":60000,
+            "PassiveDelay":7000,
+            "SendCallback":true
+       },
        {
             "Name":"VIRTUAL-SKIN-CPU-GPU",
             "Type":"UNKNOWN",