From d38d3164125a96cab49424dd97537be5a9aa405e Mon Sep 17 00:00:00 2001
From: SianyiHuang <sianyihuang@google.com>
Date: Mon, 30 May 2022 12:54:33 +0800
Subject: [PATCH 1/2] Config: Update Auto Brightness debounce and ambient
 threshold setting for p21

Bug: 234143168
Test: adb shell dumpsys display and check debounce and ambien threshold
seting

Change-Id: Ieaa8409ae3323f1118c08e5040b1a6dd7803daa0
---
 .../base/core/res/res/values/config.xml       | 153 ++++++++++--------
 1 file changed, 87 insertions(+), 66 deletions(-)

diff --git a/bluejay/overlay/frameworks/base/core/res/res/values/config.xml b/bluejay/overlay/frameworks/base/core/res/res/values/config.xml
index 3222ec0..fa97d2d 100644
--- a/bluejay/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/bluejay/overlay/frameworks/base/core/res/res/values/config.xml
@@ -152,7 +152,7 @@
          when adapting to brighter or darker environments.  This parameter controls how quickly
          brightness changes occur in response to an observed change in light level that exceeds the
          hysteresis threshold. -->
-    <integer name="config_autoBrightnessBrighteningLightDebounce">2000</integer>
+    <integer name="config_autoBrightnessBrighteningLightDebounce">1000</integer>
     <integer name="config_autoBrightnessDarkeningLightDebounce">4000</integer>
 
     <!-- Type of the udfps long press sensor. Empty if long press is not supported. -->
@@ -169,73 +169,94 @@
     <!-- the number of the max cached processes in the system. -->
     <integer name="config_customizedMaxCachedProcesses">64</integer>
 
-    <integer-array name="config_ambientThresholdLevels">
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item>5</item>
-        <item>6</item>
-        <item>7</item>
-        <item>8</item>
-        <item>9</item>
-        <item>10</item>
-        <item>20</item>
-        <item>30</item>
-        <item>40</item>
-        <item>50</item>
-        <item>60</item>
-        <item>70</item>
-        <item>80</item>
-        <item>90</item>
-        <item>100</item>
-    </integer-array>
+<integer-array name="config_ambientThresholdLevels">
+    <item>2</item>
+    <item>3</item>
+    <item>4</item>
+    <item>5</item>
+    <item>6</item>
+    <item>7</item>
+    <item>8</item>
+    <item>9</item>
+    <item>10</item>
+    <item>20</item>
+    <item>30</item>
+    <item>40</item>
+    <item>50</item>
+    <item>60</item>
+    <item>70</item>
+    <item>80</item>
+    <item>90</item>
+    <item>100</item>
+    <item>200</item>
+    <item>300</item>
+    <item>400</item>
+    <item>500</item>
+    <item>1000</item>
+    <item>2000</item>
+    <item>3000</item>
+    <item>4000</item>
+</integer-array>
 
-    <integer-array name="config_ambientBrighteningThresholds">
-        <item>11373</item>
-        <item>5000</item>
-        <item>4333</item>
-        <item>3666</item>
-        <item>3000</item>
-        <item>2760</item>
-        <item>2520</item>
-        <item>2280</item>
-        <item>2040</item>
-        <item>1800</item>
-        <item>800</item>
-        <item>527</item>
-        <item>500</item>
-        <item>470</item>
-        <item>396</item>
-        <item>322</item>
-        <item>248</item>
-        <item>174</item>
-        <item>99</item>
-        <item>99</item>
-    </integer-array>
+<integer-array name="config_ambientBrighteningThresholds">
+    <item>5186</item>
+    <item>4333</item>
+    <item>3666</item>
+    <item>2999</item>
+    <item>2759</item>
+    <item>2519</item>
+    <item>2279</item>
+    <item>2039</item>
+    <item>1799</item>
+    <item>799</item>
+    <item>527</item>
+    <item>499</item>
+    <item>470</item>
+    <item>517</item>
+    <item>565</item>
+    <item>612</item>
+    <item>660</item>
+    <item>708</item>
+    <item>742</item>
+    <item>636</item>
+    <item>582</item>
+    <item>549</item>
+    <item>369</item>
+    <item>294</item>
+    <item>269</item>
+    <item>220</item>
+    <item>220</item>
+</integer-array>
 
-    <integer-array name="config_ambientDarkeningThresholds">
-        <item>853</item>
-        <item>700</item>
-        <item>683</item>
-        <item>666</item>
-        <item>650</item>
-        <item>640</item>
-        <item>630</item>
-        <item>620</item>
-        <item>610</item>
-        <item>600</item>
-        <item>500</item>
-        <item>500</item>
-        <item>440</item>
-        <item>385</item>
-        <item>348</item>
-        <item>311</item>
-        <item>274</item>
-        <item>237</item>
-        <item>200</item>
-        <item>200</item>
-    </integer-array>
+<integer-array name="config_ambientDarkeningThresholds">
+    <item>525</item>
+    <item>683</item>
+    <item>666</item>
+    <item>650</item>
+    <item>640</item>
+    <item>630</item>
+    <item>620</item>
+    <item>610</item>
+    <item>600</item>
+    <item>500</item>
+    <item>500</item>
+    <item>440</item>
+    <item>385</item>
+    <item>382</item>
+    <item>379</item>
+    <item>376</item>
+    <item>373</item>
+    <item>371</item>
+    <item>367</item>
+    <item>387</item>
+    <item>397</item>
+    <item>403</item>
+    <item>380</item>
+    <item>345</item>
+    <item>333</item>
+    <item>283</item>
+    <item>283</item>
+</integer-array>
 
     <!-- Boolean indicating if restoring network selection should be skipped -->
     <!-- The restoring is handled by modem if it is true -->

From c814fd4c90943bfa325218b1d1c1db598a8154c1 Mon Sep 17 00:00:00 2001
From: jimmyshiu <jimmyshiu@google.com>
Date: Wed, 20 Jul 2022 17:18:18 +0000
Subject: [PATCH 2/2] Remove universal touch boost

Bug: 236781877
Test: PtsUiBench
Change-Id: I038c56cce9eb5ec19b5e8619af16001b0f2ec0bf
---
 powerhint.json | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/powerhint.json b/powerhint.json
index 6dda63d..560a6f8 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -144,7 +144,6 @@
       "Path": "/proc/vendor_sched/ta_uclamp_min",
       "Values": [
         "553",
-        "185",
         "1",
         "55"
       ],
@@ -1287,32 +1286,6 @@
       "Duration": 0,
       "Value": "1"
     },
-    {
-      "PowerHint": "ADPF_DISABLE_TA_BOOST",
-      "Type": "MaskHint",
-      "Value": "BOOST_DISPLAY"
-    },
-    {
-      "PowerHint": "ADPF_DISABLE_TA_BOOST",
-      "Type": "EndHint",
-      "Value": "BOOST_60HZ"
-    },
-    {
-      "PowerHint": "BOOST_DISPLAY",
-      "Type": "DoHint",
-      "Value": "BOOST_60HZ"
-    },
-    {
-      "PowerHint": "INTERACTION",
-      "Type": "DoHint",
-      "Value": "BOOST_DISPLAY"
-    },
-    {
-      "PowerHint": "BOOST_60HZ",
-      "Node": "TAUClampBoost",
-      "Duration": 200,
-      "Value": "185"
-    },
     {
       "PowerHint": "DISPLAY_IDLE",
       "Node": "FGPreferIdle",