From 77ffcb817c3ea9e6e9276be04782b6610ee368b5 Mon Sep 17 00:00:00 2001
From: Peter Lin <linpeter@google.com>
Date: Mon, 21 Aug 2023 01:50:46 +0000
Subject: [PATCH 1/3] display: remove blocking zone

use display device config file instead of config.xml

Bug: 295020354
test: check the dumpsys display
Change-Id: Ieb5babcd7e3770585c544b8547c94ce95aef5c1e
---
 .../frameworks/base/core/res/res/values/config.xml  | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/husky/overlay/frameworks/base/core/res/res/values/config.xml b/husky/overlay/frameworks/base/core/res/res/values/config.xml
index 64c20b4..1fff984 100644
--- a/husky/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/husky/overlay/frameworks/base/core/res/res/values/config.xml
@@ -48,19 +48,6 @@
      <!-- 140 nits: (140-2)/(1000-2)*(0.63-0.0)+0.0 = 0.087114228 -->
     <item name="config_screenBrightnessSettingDefaultFloat" format="float" type="dimen">0.087114228</item>
 
-    <!-- Not allow to switch to higher refresh rate when display brightness setting is
-         equal or less than this value -->
-    <integer-array name="config_brightnessThresholdsOfPeakRefreshRate">
-        <!-- System brightness for 8 nits: round((8-2)/(1600-2)*(255-1)+1) = 2 -->
-        <item>2</item> <!-- 14% UI brightness -->
-    </integer-array>
-    <integer-array name="config_ambientThresholdsOfPeakRefreshRate">
-        <item>5</item>
-    </integer-array>
-
-    <!-- default refresh rate in the zone defined by birghtness and ambient thresholds -->
-    <integer name="config_defaultRefreshRateInZone">120</integer>
-
     <!-- Array of light sensor LUX values to define our levels for auto backlight brightness support.
       The N entries of this array define N  1 zones as follows:
          Zone 0:        0 <= LUX < array[0]

From cc0c620b45c1cf1af4ce3c9a0547818d7bd6344b Mon Sep 17 00:00:00 2001
From: Daniel Solomon <solomondaniel@google.com>
Date: Tue, 29 Aug 2023 23:04:58 +0000
Subject: [PATCH 2/3] Disable Smooth Display by default

Set default peak refresh rate to 60Hz.

Bug: 298090782
Change-Id: Ib7ae8d4e13ae10316ee8693a496e866dcd574562
---
 shiba/overlay/frameworks/base/core/res/res/values/config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shiba/overlay/frameworks/base/core/res/res/values/config.xml b/shiba/overlay/frameworks/base/core/res/res/values/config.xml
index 69218fa..1a9b6b6 100644
--- a/shiba/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/shiba/overlay/frameworks/base/core/res/res/values/config.xml
@@ -140,7 +140,7 @@
     <integer name="config_defaultRefreshRate">0</integer>
 
     <!-- The default peak refresh rate. -->
-    <integer name="config_defaultPeakRefreshRate">120</integer>
+    <integer name="config_defaultPeakRefreshRate">60</integer>
 
     <integer-array name="config_ambientThresholdLevels">
         <item>2</item>

From dc91348e89cf8b68e27c8610c5e87aad686bbdea Mon Sep 17 00:00:00 2001
From: Wayne Lin <waynewhlin@google.com>
Date: Tue, 29 Aug 2023 15:20:01 +0800
Subject: [PATCH 3/3] gps: set high accuracy shape mode

Bug: 277337710
Test: verify pass in b/277336756#comment32
Change-Id: I662d53739ef29a07c6816247a4a699ae6d3b92d2
---
 location/gps.xml          | 1 +
 location/gps.xml.hk3      | 1 +
 location/gps.xml.sb3      | 1 +
 location/gps_user.xml     | 1 +
 location/gps_user.xml.hk3 | 1 +
 location/gps_user.xml.sb3 | 1 +
 6 files changed, 6 insertions(+)

diff --git a/location/gps.xml b/location/gps.xml
index 7fd151a..7a6ce2c 100644
--- a/location/gps.xml
+++ b/location/gps.xml
@@ -58,6 +58,7 @@
        AssertEnabled="true"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
+       CpLppHighAccuracyShapeMode="2"
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
diff --git a/location/gps.xml.hk3 b/location/gps.xml.hk3
index 61e3625..8ad70f0 100644
--- a/location/gps.xml.hk3
+++ b/location/gps.xml.hk3
@@ -58,6 +58,7 @@
        AssertEnabled="true"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
+       CpLppHighAccuracyShapeMode="2"
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
diff --git a/location/gps.xml.sb3 b/location/gps.xml.sb3
index c1fe15b..1c42ca0 100644
--- a/location/gps.xml.sb3
+++ b/location/gps.xml.sb3
@@ -58,6 +58,7 @@
        AssertEnabled="true"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
+       CpLppHighAccuracyShapeMode="2"
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
diff --git a/location/gps_user.xml b/location/gps_user.xml
index 86fa5e3..9d42ff3 100644
--- a/location/gps_user.xml
+++ b/location/gps_user.xml
@@ -57,6 +57,7 @@
        AssertEnabled="false"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
+       CpLppHighAccuracyShapeMode="2"
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
diff --git a/location/gps_user.xml.hk3 b/location/gps_user.xml.hk3
index 27d43ef..94f5955 100644
--- a/location/gps_user.xml.hk3
+++ b/location/gps_user.xml.hk3
@@ -57,6 +57,7 @@
        AssertEnabled="false"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
+       CpLppHighAccuracyShapeMode="2"
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
diff --git a/location/gps_user.xml.sb3 b/location/gps_user.xml.sb3
index 62af598..f19e50f 100644
--- a/location/gps_user.xml.sb3
+++ b/location/gps_user.xml.sb3
@@ -57,6 +57,7 @@
        AssertEnabled="false"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
+       CpLppHighAccuracyShapeMode="2"
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"