From 926a265425c541edb9b1ff09d9e9be71f5c6c3fc Mon Sep 17 00:00:00 2001
From: Bassem Khalife <bkhalife@google.com>
Date: Thu, 10 Aug 2023 19:57:59 +0000
Subject: [PATCH 1/3] Update lynx SVN to  15

Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:298ba980a2bfcc3b0628cee69670f2c3e35f626b)
Merged-In: I8981f42c3b0b8ba9e5246c0aaedaafc5d7bfe71a
Change-Id: I8981f42c3b0b8ba9e5246c0aaedaafc5d7bfe71a
---
 device-lynx.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device-lynx.mk b/device-lynx.mk
index f065078..7b87027 100644
--- a/device-lynx.mk
+++ b/device-lynx.mk
@@ -203,7 +203,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=14
+    ro.vendor.build.svn=15
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \

From 65490d791d5da1277ed92f769b95c48787d85211 Mon Sep 17 00:00:00 2001
From: Lokesh Kumar Goel <lokeshgoel@google.com>
Date: Tue, 15 Aug 2023 00:11:37 +0000
Subject: [PATCH 2/3] Update lynx SVN to  16

Bug: 295937899
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:cd45a63aaffa3c0dc714b9d51d1727cca682dbc6)
Merged-In: Icb163819116e61292429a2c1c362d40649a6f7e8
Change-Id: Icb163819116e61292429a2c1c362d40649a6f7e8
---
 device-lynx.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device-lynx.mk b/device-lynx.mk
index 7b87027..003748e 100644
--- a/device-lynx.mk
+++ b/device-lynx.mk
@@ -203,7 +203,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=15
+    ro.vendor.build.svn=16
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \

From 17bb9133e004b99c57ef3bcfc44f821d8cc90cf1 Mon Sep 17 00:00:00 2001
From: Edwin Tung <edwintung@google.com>
Date: Thu, 27 Jul 2023 13:45:33 +0800
Subject: [PATCH 3/3] gps: Disable Vzw SUPL OTDOA

Bug: 293213801

Test: OTDOA disabled
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7a3b1491fe6cf7d70a641d3f0e4fb7e7f816e22f)
Merged-In: If504f67da0640634ff30379a14af4e15f062fefa
Change-Id: If504f67da0640634ff30379a14af4e15f062fefa
---
 location/gps.xml.l10      | 2 +-
 location/gps_user.xml.l10 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/location/gps.xml.l10 b/location/gps.xml.l10
index 3463633..c51fd4d 100644
--- a/location/gps.xml.l10
+++ b/location/gps.xml.l10
@@ -35,7 +35,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
+       SuplOtdoaCapable2="false"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
diff --git a/location/gps_user.xml.l10 b/location/gps_user.xml.l10
index f877c95..b996bf0 100644
--- a/location/gps_user.xml.l10
+++ b/location/gps_user.xml.l10
@@ -34,7 +34,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
+       SuplOtdoaCapable2="false"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"