From 08da7a3af6dfb7771053ac402d02f6d45983da46 Mon Sep 17 00:00:00 2001
From: achigoliu <achigoliu@google.com>
Date: Thu, 4 Aug 2022 22:40:44 +0800
Subject: [PATCH 1/2] Bundle handheld_core_hardware.xml

Bug: 237110906
Test: Manual, verify build artifacts
Signed-off-by: achigoliu <achigoliu@google.com>
Change-Id: I92137b615c7bce28026f858c201d8bd530754b5b
---
 device-lynx.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/device-lynx.mk b/device-lynx.mk
index 50f95e4..edbdb76 100644
--- a/device-lynx.mk
+++ b/device-lynx.mk
@@ -199,3 +199,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 # Limit camera 1080P 60FPS binning mode to not rear main camera
 PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.camera.1080P_60fps_binning_except_rear_main=true
+
+# Device features
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml

From 47e5d68e3c675d106a5e91590c7915edbefda22b Mon Sep 17 00:00:00 2001
From: Junkyu Kang <junkyukang@google.com>
Date: Wed, 20 Jul 2022 18:41:27 +0800
Subject: [PATCH 2/2] gps: Enable SI SUPL over Wifi

Test: -
- SI SUPL Wifi on + mobile network off
- SI SUPL Wifi on + mobile network on
- SI SUPL Wifi off + mobile network on
- SI SUPL Wifi on + airplane mode on
Bug: 239671126

Change-Id: I308f7501085be765c3cdcc9858b93e98554b2bc3
---
 gps.xml.l10      | 5 ++++-
 gps_user.xml.l10 | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/gps.xml.l10 b/gps.xml.l10
index 6285691..0400cef 100644
--- a/gps.xml.l10
+++ b/gps.xml.l10
@@ -20,7 +20,10 @@
 
        SuplSslMethod="SSLv23_NO_TLSv1_2"
        SuplEnable="true"
-       SuplUseApn="true"
+       SuplUseApn="false"
+       SuplUseApnNI="true"
+       SuplUseFwCellInfo="false"
+       SuplDummyCellInfo ="true"
        SuplTlsCertDirPath="/etc/security/cacerts"
        SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
        SuplUT1Seconds="20"
diff --git a/gps_user.xml.l10 b/gps_user.xml.l10
index 19dbbef..c347740 100644
--- a/gps_user.xml.l10
+++ b/gps_user.xml.l10
@@ -19,7 +19,10 @@
 
        SuplSslMethod="SSLv23_NO_TLSv1_2"
        SuplEnable="true"
-       SuplUseApn="true"
+       SuplUseApn="false"
+       SuplUseApnNI="true"
+       SuplUseFwCellInfo="false"
+       SuplDummyCellInfo ="true"
        SuplTlsCertDirPath="/etc/security/cacerts"
        SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
        SuplUT1Seconds="20"