From 304c52f55599d7fd87a50bd654b4bdc7bb015ff0 Mon Sep 17 00:00:00 2001
From: Cheng Chang <chengcha@google.com>
Date: Mon, 20 May 2024 07:31:50 +0000
Subject: [PATCH 1/4] gps: Enable MTPL function

Bug: 339333771
Test: Modem reset test and location on/off stress b/339333771
Test: SST test pass at b/339333771
Change-Id: I8f6e50f0c9b59290a395e2e655bef09e3703739b
---
 location/user/gps.cfg      | 2 +-
 location/userdebug/gps.cfg | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/location/user/gps.cfg b/location/user/gps.cfg
index 392b06f..18fa6b4 100644
--- a/location/user/gps.cfg
+++ b/location/user/gps.cfg
@@ -34,7 +34,7 @@ qzssUsedInUSPolicy=2
 navicUsedInUSPolicy=2
 Chip_Configuration_FeatureCfg_DVS = 1
 Chip_Configuration_FeatureCfg_DFS = 1
-Chip_Configuration_FeatureCfg_MTPL = 0
+Chip_Configuration_FeatureCfg_MTPL = 1
 Chip_Configuration_FeatureCfg_SDL_BYASS = 1
 mailboxDisabled=0x0
 gnss_rfic_chip_id=55400000
diff --git a/location/userdebug/gps.cfg b/location/userdebug/gps.cfg
index e3f79ea..802d006 100644
--- a/location/userdebug/gps.cfg
+++ b/location/userdebug/gps.cfg
@@ -123,8 +123,8 @@ navicUsedInUSPolicy=2
 # DFS: 0 = Disabled, 1 = Enabled (default)
 Chip_Configuration_FeatureCfg_DVS = 1
 Chip_Configuration_FeatureCfg_DFS = 1
-# Disable MTPL
-Chip_Configuration_FeatureCfg_MTPL = 0
+# MTPL: 0 = Disabled, 1 = Enabled
+Chip_Configuration_FeatureCfg_MTPL = 1
 # MCW Link failure behavior: 0 = SW Assert (default), 1 = GNSS restart (hot start)
 Chip_Configuration_FeatureCfg_SDL_BYASS = 1
 

From f1125b8f9c1db281a9279fd9b65cdca51ca19c60 Mon Sep 17 00:00:00 2001
From: Cathy Hsu <cathsu@google.com>
Date: Wed, 22 May 2024 03:47:49 +0000
Subject: [PATCH 2/4] display: update reduceBrightColorsStrength setting

Bug: 335669303
Test: dumpsys color_display
Change-Id: Ie9f349606d5d92069e01d36339fabfc5a0c431fd
---
 .../frameworks/base/core/res/res/values/config.xml       | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/comet/overlay/frameworks/base/core/res/res/values/config.xml b/comet/overlay/frameworks/base/core/res/res/values/config.xml
index 81aeacc..9fd0a6f 100644
--- a/comet/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/comet/overlay/frameworks/base/core/res/res/values/config.xml
@@ -28,6 +28,15 @@
     <!-- Minimum screen brightness allowed by the power manager. -->
     <integer name="config_screenBrightnessDim">6</integer>
 
+     <!-- Default strength, in percentage, of bright color reduction when activated. -->
+    <integer name="config_reduceBrightColorsStrengthDefault">35</integer>
+
+    <!-- Minimum strength, in percentage, supported by bright color reduction. -->
+    <integer name="config_reduceBrightColorsStrengthMin">25</integer>
+
+    <!-- Maximum strength, in percentage, supported by bright color reduction. -->
+    <integer name="config_reduceBrightColorsStrengthMax">50</integer>
+
     <!-- Minimum screen brightness setting allowed by power manager.
          The user is forbidden from setting the brightness below this level.  -->
     <item name="config_screenBrightnessSettingMinimumFloat" format="float" type="dimen">0.0</item>

From f278cf1f2158b47ef6c6c4e71851482ce53873bb Mon Sep 17 00:00:00 2001
From: Massimo Carli <mcarli@google.com>
Date: Fri, 17 May 2024 09:33:18 +0000
Subject: [PATCH 3/4] Import font_scale option for restore

Makes available font_scale for the device in SettingsProvider

Bug: 337988698
Test: m

Change-Id: I5e4b33764c6815b2fc1bbeb3f5b29379fdfcd9ef
---
 .../SettingsProvider/res/values/arrays.xml    | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 comet/overlay/frameworks/base/packages/SettingsProvider/res/values/arrays.xml

diff --git a/comet/overlay/frameworks/base/packages/SettingsProvider/res/values/arrays.xml b/comet/overlay/frameworks/base/packages/SettingsProvider/res/values/arrays.xml
new file mode 100644
index 0000000..805ef73
--- /dev/null
+++ b/comet/overlay/frameworks/base/packages/SettingsProvider/res/values/arrays.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2024 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- NOTE: if you change this, you must also add the corresponding scale key and lookup table to
+     frameworks/base/core/java/android/content/res/FontScaleConverterFactory.java
+     TODO(b/341235102): Remove font_scale array duplication.
+     -->
+    <string-array name="entryvalues_font_size" translatable="false">
+        <item>1.0</item>
+        <item>1.05</item>
+        <item>1.1</item>
+        <item>1.20</item>
+        <item>1.30</item>
+        <item>1.50</item>
+        <item>1.80</item>
+        <item>2.0</item>
+    </string-array>
+
+</resources>

From 94900c3cf8aea7b0f7540862ba89d49f38bbbcce Mon Sep 17 00:00:00 2001
From: Weizhung Ding <weizhungding@google.com>
Date: Wed, 22 May 2024 08:04:16 +0000
Subject: [PATCH 4/4] display: keep 60Hz HS mode when switching to NS

We do not support NS mode

Bug: 337807490
Test: smooth display on/off, AoD entry/exit
Change-Id: I9ad54af5c365e107e11b945eef37a8f9fd882d39
---
 device-comet.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device-comet.mk b/device-comet.mk
index d93e95b..b18b870 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -100,7 +100,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.powerstats.entity
 
 PRODUCT_VENDOR_PROPERTIES += \
     vendor.primarydisplay.op.hs_hz=120 \
-    vendor.primarydisplay.op.ns_hz=60
+    vendor.primarydisplay.op.ns_hz=120
 
 PRODUCT_PROPERTY_OVERRIDES += \
 	vendor.camera.debug.enable_software_post_sharpen_node=false