From 47c84e1cb180072a0026aa16c2e89ba5bd280cec Mon Sep 17 00:00:00 2001
From: Christine Franks <christyfranks@google.com>
Date: Fri, 20 Jan 2023 08:24:04 -0800
Subject: [PATCH 1/2] Set DWB transition speed and high light range

Transition speed set to 30s, high light range set to
130k-150k lux.

Bug: 255417189
Bug: 266436992
Test: builds

Change-Id: I68c6b63d6337ceab937c99292b49fe0254bf626e
---
 .../overlay/frameworks/base/core/res/res/values/config.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml b/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml
index fd34b17..572d514 100644
--- a/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml
@@ -254,8 +254,8 @@
          1) Contain at least two entries
          2) Be the same length as config_displayWhiteBalanceHighLightAmbientBiases. -->
     <array name ="config_displayWhiteBalanceHighLightAmbientBrightnesses">
-        <item>3000.0</item>
-        <item>5000.0</item>
+        <item>130000.0</item>
+        <item>150000.0</item>
     </array>
 
     <!-- See DisplayWhiteBalanceController.
@@ -273,6 +273,9 @@
          config_displayWhiteBalanceHighLightAmbientBrightnesses. -->
     <item name="config_displayWhiteBalanceHighLightAmbientColorTemperature" format="float" type="dimen">6700.0</item>
 
+    <!-- Duration, in milliseconds, of the display white balance animated transitions. -->
+    <integer name="config_displayWhiteBalanceTransitionTime">30000</integer>
+
     <!-- Enable doze mode
          ComponentName of a dream to show whenever the system would otherwise have gone to sleep. -->
     <string translatable="false" name="config_dozeComponent"></string>

From e45d8c53c1a629f7f08b34e655b3e368036c658e Mon Sep 17 00:00:00 2001
From: TeYuan Wang <kamewang@google.com>
Date: Mon, 16 Jan 2023 18:58:41 +0800
Subject: [PATCH 2/2] thermal: align the tpu, gxp throttling policy with P22

Bug: 261692386
Test: verified by emul_temp
Change-Id: I49b29efe9d3da5330beaee5b73563657c1d976e9
---
 thermal_info_config_tangorpro.json | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/thermal_info_config_tangorpro.json b/thermal_info_config_tangorpro.json
index 6dd33f0..4b6ac63 100644
--- a/thermal_info_config_tangorpro.json
+++ b/thermal_info_config_tangorpro.json
@@ -115,7 +115,17 @@
             "Multiplier":0.001,
             "SendCallback":true,
             "PollingDelay":300000,
-            "PassiveDelay":7000
+            "PassiveDelay":7000,
+            "BindedCdevInfo": [
+                {
+                    "CdevRequest": "tpu_cooling",
+                    "LimitInfo": [0, 2, 3, 4, 5, 5, 5]
+                },
+                {
+                    "CdevRequest": "gxp-cooling",
+                    "LimitInfo": [0, 0, 0, 0, 0, 99, 99]
+                }
+            ]
         },
         {
             "Name":"VIRTUAL-SKIN-HINT",
@@ -596,6 +606,11 @@
             "Type":"NPU",
             "WritePath":"/dev/thermal/cdev-by-name/tpu_cooling/user_vote"
         },
+        {
+            "Name":"gxp-cooling",
+            "Type":"NPU",
+            "WritePath":"/dev/thermal/cdev-by-name/gxp-cooling/user_vote"
+        },
         {
             "Name":"fcc",
             "Type":"BATTERY"