From c4a2ca604d913578dd6b6f52c6a584849ed36c42 Mon Sep 17 00:00:00 2001
From: linpeter <linpeter@google.com>
Date: Fri, 4 Jun 2021 12:05:22 +0800
Subject: [PATCH 1/3] oriole: update blocking zones

Set Zone 2: < 30 Lux and UI brightness 45%. Lock 90Hz
Set Zone 3: > 50,000 Lux and UI normal brightness 100%. Lock 60Hz

Bug: 187929149
Bug: 190018500
Test: no refresh rate chagne in the blocking zone
Change-Id: Iffe10c76cfff1c8eac9361e68a10377d26b48d10
---
 .../base/core/res/res/values/config.xml         | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
index 1bc575c..7cf28e5 100644
--- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
@@ -176,14 +176,27 @@
          equal or less than this value -->
     <integer-array name="config_brightnessThresholdsOfPeakRefreshRate">
         <item>7</item> <!-- 33% UI brightness -->
-        <item>9</item> <!-- 40% UI brightness -->
+        <item>11</item> <!-- 45% UI brightness -->
     </integer-array>
     <integer-array name="config_ambientThresholdsOfPeakRefreshRate">
         <item>-1</item>
-        <item>20</item>
+        <item>30</item>
     </integer-array>
 
     <!-- default refresh rate in the zone defined by birghtness and ambient thresholds -->
     <integer name="config_defaultRefreshRateInZone">90</integer>
 
+    <!-- Switch to fixed refresh rate when display brightness setting is
+         equal or more than this value -->
+    <integer-array name="config_highDisplayBrightnessThresholdsOfFixedRefreshRate">
+        <item>158</item> <!--100% UI normal brightness -->
+    </integer-array>
+
+    <integer-array name="config_highAmbientBrightnessThresholdsOfFixedRefreshRate">
+        <item>50000</item>
+    </integer-array>
+
+    <!-- default refresh rate in the high zone defined by birghtness and ambient thresholds -->
+    <integer name="config_fixedRefreshRateInHighZone">60</integer>
+
 </resources>

From f3caaf71bfd4322fa52e63482abc9ae876598ff8 Mon Sep 17 00:00:00 2001
From: Edwin Tung <edwintung@google.com>
Date: Wed, 9 Jun 2021 18:08:52 +0800
Subject: [PATCH 2/3] Update gps currents based on the measurement.

Bug: 186995059

Test: manual
Change-Id: I7d4788af5cddb7d020b5d2188395cadc72bff144
---
 .../frameworks/base/core/res/res/xml/power_profile.xml        | 4 ++--
 .../frameworks/base/core/res/res/xml/power_profile.xml        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/oriole/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/oriole/overlay/frameworks/base/core/res/res/xml/power_profile.xml
index 9e81760..c867689 100644
--- a/oriole/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/oriole/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -170,8 +170,8 @@
 
     <!-- GPS related values.-->
     <array name="gps.signalqualitybased"> <!-- Strength 0 to 1 -->
-        <value>28</value>
-        <value>5</value>
+        <value>23.9</value>
+        <value>21.3</value>
     </array>
     <item name="gps.voltage">3700</item>
 
diff --git a/raven/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/raven/overlay/frameworks/base/core/res/res/xml/power_profile.xml
index 9e81760..c867689 100644
--- a/raven/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/raven/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -170,8 +170,8 @@
 
     <!-- GPS related values.-->
     <array name="gps.signalqualitybased"> <!-- Strength 0 to 1 -->
-        <value>28</value>
-        <value>5</value>
+        <value>23.9</value>
+        <value>21.3</value>
     </array>
     <item name="gps.voltage">3700</item>
 

From 604aa67bcff14b67f9ea2cedc5d0a36ddacb74de Mon Sep 17 00:00:00 2001
From: George Lee <geolee@google.com>
Date: Thu, 10 Jun 2021 14:08:05 -0700
Subject: [PATCH 3/3] thermal: add soc to thermal HAL monitoring

Oriole WHI A updated.

Bug: 188365095
Test: Confirm throttling based on criteria matched
Signed-off-by: George Lee <geolee@google.com>
Change-Id: Ic3dcb7ed7af8aa40f56087fa72603e21c5c6b1ec
---
 thermal_info_config_oriole_WHI_A.json | 34 +++++++++++++++++++++------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/thermal_info_config_oriole_WHI_A.json b/thermal_info_config_oriole_WHI_A.json
index a2e12e5..6a71f31 100644
--- a/thermal_info_config_oriole_WHI_A.json
+++ b/thermal_info_config_oriole_WHI_A.json
@@ -361,14 +361,34 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                "NAN",
                 90,
-                "NAN",
+                93,
+                96,
                 "NAN"
             ],
             "VrThreshold":"NAN",
             "Multiplier":1,
-            "Monitor":false
+            "Monitor":true,
+            "PollingDelay":300000,
+            "PassiveDelay":5000,
+            "BindedCdevInfo": [
+                {
+                    "CdevRequest": "thermal-cpufreq-2",
+                    "LimitInfo": [0, 0, 0, 7, 7, 10, 10]
+                },
+                {
+                    "CdevRequest": "thermal-cpufreq-0",
+                    "LimitInfo": [0, 0, 0, 0, 0, 0, 0]
+                },
+                {
+                    "CdevRequest": "thermal-cpufreq-1",
+                    "LimitInfo": [0, 0, 0, 0, 0, 0, 0]
+                },
+                {
+                    "CdevRequest": "thermal-gpufreq-0",
+                    "LimitInfo": [0, 0, 0, 0, 0, 0, 0]
+                }
+            ]
         },
         {
             "Name":"vdroop1",
@@ -474,7 +494,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                13.2,
+                12,
                 "NAN",
                 "NAN"
             ],
@@ -490,7 +510,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                12,
+                9,
                 "NAN",
                 "NAN"
             ],
@@ -522,7 +542,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                10.5,
+                8.5,
                 "NAN",
                 "NAN"
             ],
@@ -538,7 +558,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                13.2,
+                9,
                 "NAN",
                 "NAN"
             ],