commit e45b9e738f9a227e367c2b65d9ad88a8fbe08ef9
author Xin Li <delphij@google.com> Wed Jun 05 14:12:12 2024 -0700
committer Xin Li <delphij@google.com> Wed Jun 05 14:12:12 2024 -0700
tree 0a47189777191760d361870bc4e68261ac02bd64
parent 452f7aaf40cc7faf69489972bf854d287da51148
parent f5a52eac27e73343ee71d87aa177acaca4b9a7ec

Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future

Bug: 343100748
Merged-In: Ib3b9baf24d3f0d5622ae63f11aa564df35fd14df
Change-Id: I83b750e16fe6e611c042ab32cb1577c3ee0e69e8

device-cheetah.mk

diff --git a/device-cheetah.mk b/device-cheetah.mk
index eb12309..2355556 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -336,7 +336,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=50
+    ro.vendor.build.svn=57
 
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \

device-panther.mk

diff --git a/device-panther.mk b/device-panther.mk
index bb23a15..bc3b405 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -320,7 +320,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=50
+    ro.vendor.build.svn=57
 
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \

location/gps.xml

diff --git a/location/gps.xml b/location/gps.xml
index c17d9b6..5427c53 100644
--- a/location/gps.xml
+++ b/location/gps.xml
@@ -35,7 +35,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
+       SuplOtdoaCapable2="false"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"

location/gps.xml.c10

diff --git a/location/gps.xml.c10 b/location/gps.xml.c10
index 0d8ce90..e1b34f8 100644
--- a/location/gps.xml.c10
+++ b/location/gps.xml.c10
@@ -35,7 +35,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
+       SuplOtdoaCapable2="false"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"

location/gps.xml.p10

diff --git a/location/gps.xml.p10 b/location/gps.xml.p10
index 8ed3136..03d5ecb 100644
--- a/location/gps.xml.p10
+++ b/location/gps.xml.p10
@@ -35,7 +35,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
+       SuplOtdoaCapable2="false"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"

location/gps_user.xml

diff --git a/location/gps_user.xml b/location/gps_user.xml
index 3cde3f9..2301861 100644
--- a/location/gps_user.xml
+++ b/location/gps_user.xml
@@ -34,7 +34,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
+       SuplOtdoaCapable2="false"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"

location/gps_user.xml.c10

diff --git a/location/gps_user.xml.c10 b/location/gps_user.xml.c10
index 84c35e7..c3d1498 100644
--- a/location/gps_user.xml.c10
+++ b/location/gps_user.xml.c10
@@ -34,7 +34,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
+       SuplOtdoaCapable2="false"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"

location/gps_user.xml.p10

diff --git a/location/gps_user.xml.p10 b/location/gps_user.xml.p10
index 3832f9b..5defc80 100644
--- a/location/gps_user.xml.p10
+++ b/location/gps_user.xml.p10
@@ -34,7 +34,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
+       SuplOtdoaCapable2="false"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"