From 99407412b655fc180142ce89cdd73f6a13fdfdc8 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/3] Add location bypass package overlay

Test: verify values on devices
Bug: 230919427
Bug: 210118427
Change-Id: I93acd0083c433aaf889530464142c9a3c9b95878
Merged-In: I93acd0083c433aaf889530464142c9a3c9b95878
(cherry picked from commit 1b527e8836bd0ef3f9cd5ad29a6c9ad05139c596)
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 2527a302..8f8f9fcf 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -267,4 +267,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 de29a14a9ace718495eea2a3074c69253e5e4885 Mon Sep 17 00:00:00 2001
From: Rick Chen <rickctchen@google.com>
Date: Mon, 4 Jul 2022 22:27:19 +0800
Subject: [PATCH 2/3] usf: Include usf_product.mk for USF PDK.

Bug: 237953890
Test: Compile pass. Verified sensor list & sampling on R4.
      The validation is done both on PDK build and tm-qpr-dev build.
Signed-off-by: Rick Chen <rickctchen@google.com>
Change-Id: Iff49dc63e1a3601dd254c292504aaf32dec79687
---
 device.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/device.mk b/device.mk
index e7af97ef..3ea32c3a 100644
--- a/device.mk
+++ b/device.mk
@@ -941,7 +941,11 @@ endif
 #$(call inherit-product-if-exists, hardware/google_devices/gs101/gs101.mk)
 #$(call inherit-product-if-exists, vendor/google_devices/common/exynos-vendor.mk)
 #$(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4375/device-bcm.mk)
+ifeq ($(wildcard vendor/google/sensors/usf),)
+$(call inherit-product-if-exists, vendor/google_devices/gs101/proprietary/usf/usf_product.mk)
+else
 $(call inherit-product-if-exists, vendor/google/sensors/usf/android/usf_efw_product.mk)
+endif
 $(call inherit-product-if-exists, vendor/google/services/LyricCameraHAL/src/build/device-vendor.mk)
 $(call inherit-product-if-exists, vendor/google/camera/devices/whi/device-vendor.mk)
 

From b94ea0c39e5cef4ff5bb1dd85d515d22d7c195b3 Mon Sep 17 00:00:00 2001
From: Martin Liu <liumartin@google.com>
Date: Mon, 4 Jul 2022 21:49:39 +0800
Subject: [PATCH 3/3] Revert "Disable zone dma32"

This reverts commit 645967d3e55a2db86470d4fddf22e2e2fcf778b1.

Reason to revert: move setting to individual project.
Bug: 236225957
Test: boot
Change-Id: I201c544ee4f42ea7f0f69924f38a394ae07cc416
(cherry picked from commit df489c68fa0c64d69533d9897a5e84779e8237c1)
---
 BoardConfig-common.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 723fc2e9..73eafa2f 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -47,7 +47,6 @@ BOARD_KERNEL_CMDLINE += dyndbg=\"func alloc_contig_dump_pages +p\"
 BOARD_KERNEL_CMDLINE += earlycon=exynos4210,0x10A00000 console=ttySAC0,115200 androidboot.console=ttySAC0 printk.devkmsg=on
 BOARD_KERNEL_CMDLINE += cma_sysfs.experimental=Y
 BOARD_KERNEL_CMDLINE += swiotlb=noforce
-BOARD_KERNEL_CMDLINE += disable_dma32=on
 BOARD_BOOTCONFIG += androidboot.boot_devices=14700000.ufs
 
 TARGET_NO_BOOTLOADER := true