From 259aa3233b42d26aff3d5fb6d4198f8447e4bb1b Mon Sep 17 00:00:00 2001
From: Sarah Chin <sarahchin@google.com>
Date: Tue, 10 May 2022 09:36:15 -0700
Subject: [PATCH 1/2] Add location bypass package overlay

Test: verify values on devices
Bug: 230919427
Bug: 210118427
Change-Id: I93acd0083c433aaf889530464142c9a3c9b95878
Merged-In: I93acd0083c433aaf889530464142c9a3c9b95878
---
 overlay/frameworks/base/core/res/res/values/config.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 7e57da0e..27766016 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -259,4 +259,13 @@
 
     <!-- Enable Zram writeback feature to allow unused pages in zram be written to flash. -->
     <bool name="config_zramWriteback">true</bool>
+
+    <!-- List of system components which are allowed to receive ServiceState entries in an
+         un-sanitized form, even if the location toggle is off. This is intended ONLY for system
+         components, such as the telephony stack, which require access to the full ServiceState for
+         tasks such as network registration. -->
+    <string-array name="config_serviceStateLocationAllowedPackages">
+        <item>"com.shannon.imsservice"</item>
+        <item>"com.android.phone"</item>
+    </string-array>
 </resources>

From c81618b480defe4a54da8e0d606f5fb6b71e7444 Mon Sep 17 00:00:00 2001
From: Christine Franks <christyfranks@google.com>
Date: Thu, 12 May 2022 15:39:13 -0700
Subject: [PATCH 2/2] Update saturated value replacement

Bug: 230903279
Test: n/a
Change-Id: I96f8db8bff4f07a0d638a56006db73bbaa2f835d
---
 overlay/frameworks/base/core/res/res/values/config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 27d55bff..6b1cfcc6 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -188,7 +188,7 @@
     <integer-array name="config_mappedColorModes">
         <item>0</item> <!-- COLOR_MODE_NATURAL -->
         <item>256</item> <!-- COLOR_MODE_BOOSTED -->
-        <item>2</item> <!-- COLOR_MODE_SATURATED -->
+        <item>3</item> <!-- COLOR_MODE_SATURATED -->
         <item>3</item> <!-- COLOR_MODE_AUTOMATIC -->
     </integer-array>