Merge UP1A.231005.007

Bug: 291102124 Merged-In: I83852b7c11925d054ef38442f3cbd564c59866a2 Change-Id: I0c04b64f69f82922f91e82fb1dbbcf973ec15051
2023-09-27 16:04:30 -07:00 · 2023-09-27 16:04:30 -07:00 · d7ea227974
commit d7ea227974
parent e28ced4930 5f4ceca888
8 changed files with 8 additions and 8 deletions
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@ -306,7 +306,7 @@ PRODUCT_VENDOR_PROPERTIES += \

 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=29
+    ro.vendor.build.svn=31

 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \
--- a/device-panther.mk
+++ b/device-panther.mk
@ -291,7 +291,7 @@ PRODUCT_VENDOR_PROPERTIES += \

 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=29
+    ro.vendor.build.svn=31

 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"