commit cfe990a02e87eadc458c28db532e04dea4e5dabc
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 2f3f4dbdc8e539846b2fc56f0ba9383e07fdda42
parent 2ddfd5a4feeae5eff17921550fe8709f3582128a
parent f8d8b994b724b1f1602ce6635d62958d4bac31a7

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

Bug: 343100748
Merged-In: I2d9b565dd6e97439876096ae7e5c88678b178087
Change-Id: I35ba2f25b5f0489fca026b315df3d4a4c09b3991

device-oriole.mk

diff --git a/device-oriole.mk b/device-oriole.mk
index 45da46b..2857ba3 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -208,7 +208,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=78
+    ro.vendor.build.svn=82
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \

device-raven.mk

diff --git a/device-raven.mk b/device-raven.mk
index 8eb8091..7568074 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -212,7 +212,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=78
+    ro.vendor.build.svn=82
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \

location/gps.xml

diff --git a/location/gps.xml b/location/gps.xml
index 52827b8..f98c248 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.oriole

diff --git a/location/gps.xml.oriole b/location/gps.xml.oriole
index 323fe17..6781e32 100644
--- a/location/gps.xml.oriole
+++ b/location/gps.xml.oriole
@@ -35,7 +35,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
+       SuplOtdoaCapable2="false"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"

location/gps.xml.raven

diff --git a/location/gps.xml.raven b/location/gps.xml.raven
index f205e75..681edc5 100644
--- a/location/gps.xml.raven
+++ b/location/gps.xml.raven
@@ -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 a5a4066..c5241bc 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.oriole

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

location/gps_user.xml.raven

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