From 9d6c2d97aca889f18333a21c89976a87ba608cb3 Mon Sep 17 00:00:00 2001
From: Blake Kragten <kragtenb@google.com>
Date: Thu, 3 Jun 2021 17:18:39 -0700
Subject: [PATCH 1/2] Fixing Cellular-Emergency Hysteresis

Bug: 190115475
Test: On Device Testing
Change-Id: I9751d156c0edb14503748e2efd3ee5e8c9c6dad3
---
 thermal_info_config_oriole.json | 2 +-
 thermal_info_config_raven.json  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json
index 12f9a4f..b763694 100644
--- a/thermal_info_config_oriole.json
+++ b/thermal_info_config_oriole.json
@@ -376,8 +376,8 @@
                 0.0,
                 0.0,
                 0.0,
-                1.9,
                 0.0,
+                1.9,
                 0.0
             ],
             "VrThreshold":"NAN",
diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json
index c2820bf..ddb20cd 100644
--- a/thermal_info_config_raven.json
+++ b/thermal_info_config_raven.json
@@ -376,8 +376,8 @@
                 0.0,
                 0.0,
                 0.0,
-                1.9,
                 0.0,
+                1.9,
                 0.0
             ],
             "VrThreshold":"NAN",

From 79a3b702d42c82fd74ee481b54069dcea9258340 Mon Sep 17 00:00:00 2001
From: Jia-yi Chen <jychen@google.com>
Date: Wed, 2 Jun 2021 14:05:18 -0700
Subject: [PATCH 2/2] thermal: Update thermal config

1) Update VIRTUAL-QI-GNSS formula for Oriole
2) Lower shotdown threshold by 1C for Oriole
3) Disable charging at SEVERE for Oriole & Raven

Bug: 189888812
Bug: 190201749
Test: Boot
Change-Id: Iffc42a6f90935a8f1361bc04aeb08743b839aadc
---
 thermal_info_config_oriole.json | 8 ++++----
 thermal_info_config_raven.json  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json
index b763694..10c1d21 100644
--- a/thermal_info_config_oriole.json
+++ b/thermal_info_config_oriole.json
@@ -150,7 +150,7 @@
                 "0.25",
                 "0.75"
             ],
-            "Offset":-5500,
+            "Offset":-4500,
             "HotThreshold":[
                 "NAN",
                 "NAN",
@@ -266,7 +266,7 @@
                 "45.0",
                 "47.0",
                 "52.0",
-                "56.0"
+                "55.0"
             ],
             "HotHysteresis":[
                 0.0,
@@ -336,11 +336,11 @@
                 },
                 {
                     "CdevRequest": "fcc",
-                    "LimitInfo": [0, 2, 3, 4, 5, 5, 5]
+                    "LimitInfo": [0, 2, 3, 5, 5, 5, 5]
                 },
                 {
                     "CdevRequest": "dc_icl",
-                    "LimitInfo": [0, 1, 2, 3, 4, 4, 4]
+                    "LimitInfo": [0, 1, 2, 4, 4, 4, 4]
                 }
             ]
         },
diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json
index ddb20cd..eb1fb2a 100644
--- a/thermal_info_config_raven.json
+++ b/thermal_info_config_raven.json
@@ -336,11 +336,11 @@
                 },
                 {
                     "CdevRequest": "fcc",
-                    "LimitInfo": [0, 2, 3, 4, 5, 5, 5]
+                    "LimitInfo": [0, 2, 3, 5, 5, 5, 5]
                 },
                 {
                     "CdevRequest": "dc_icl",
-                    "LimitInfo": [0, 1, 2, 3, 4, 4, 4]
+                    "LimitInfo": [0, 1, 2, 4, 4, 4, 4]
                 }
             ]
         },