commit 6742137ad54acd460d06ce6a8123de63b73f1c8f
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Oct 03 23:33:48 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Oct 03 23:33:48 2024 +0000
tree 9ae18c39d860b5d383d0962cf0deb0640ce560a1
parent a582d37c28f9ae8b8fb710df910c53b5e5a4a9a4
parent ac1bb3f2dac59774df08f33458bea15d1d680313

Merge cherrypicks of ['googleplex-android-review.googlesource.com/29492512'] into 24Q4-release.

Change-Id: I8757b07de357b1840429984f1b3140ca2cd79472

location/gps.6.1.xml.oriole

diff --git a/location/gps.6.1.xml.oriole b/location/gps.6.1.xml.oriole
index f442e3a..df40156 100644
--- a/location/gps.6.1.xml.oriole
+++ b/location/gps.6.1.xml.oriole
@@ -18,7 +18,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"

location/gps.6.1.xml.raven

diff --git a/location/gps.6.1.xml.raven b/location/gps.6.1.xml.raven
index 3726311..c831068 100644
--- a/location/gps.6.1.xml.raven
+++ b/location/gps.6.1.xml.raven
@@ -18,7 +18,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"

location/gps.xml

diff --git a/location/gps.xml b/location/gps.xml
index 76eb81e..009aaec 100644
--- a/location/gps.xml
+++ b/location/gps.xml
@@ -18,7 +18,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"

location/gps.xml.oriole

diff --git a/location/gps.xml.oriole b/location/gps.xml.oriole
index 2f191d6..4833857 100644
--- a/location/gps.xml.oriole
+++ b/location/gps.xml.oriole
@@ -18,7 +18,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"

location/gps.xml.raven

diff --git a/location/gps.xml.raven b/location/gps.xml.raven
index 3ddfe1c..d663ebf 100644
--- a/location/gps.xml.raven
+++ b/location/gps.xml.raven
@@ -18,7 +18,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"

location/gps_user.6.1.xml.oriole

diff --git a/location/gps_user.6.1.xml.oriole b/location/gps_user.6.1.xml.oriole
index ccea80d..0582009 100644
--- a/location/gps_user.6.1.xml.oriole
+++ b/location/gps_user.6.1.xml.oriole
@@ -17,7 +17,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"

location/gps_user.6.1.xml.raven

diff --git a/location/gps_user.6.1.xml.raven b/location/gps_user.6.1.xml.raven
index 2230ace..c276c11 100644
--- a/location/gps_user.6.1.xml.raven
+++ b/location/gps_user.6.1.xml.raven
@@ -17,7 +17,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"

location/gps_user.xml

diff --git a/location/gps_user.xml b/location/gps_user.xml
index 405b8b6..008efb0 100644
--- a/location/gps_user.xml
+++ b/location/gps_user.xml
@@ -17,7 +17,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"

location/gps_user.xml.oriole

diff --git a/location/gps_user.xml.oriole b/location/gps_user.xml.oriole
index f935676..ec8d881 100644
--- a/location/gps_user.xml.oriole
+++ b/location/gps_user.xml.oriole
@@ -17,7 +17,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"

location/gps_user.xml.raven

diff --git a/location/gps_user.xml.raven b/location/gps_user.xml.raven
index ff3c5e2..3489a66 100644
--- a/location/gps_user.xml.raven
+++ b/location/gps_user.xml.raven
@@ -17,7 +17,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"