From 149158d5ec0f3e70de4d2eff4c6897f49933088f Mon Sep 17 00:00:00 2001
From: Isaac Chiou <isaacchiou@google.com>
Date: Fri, 1 Nov 2024 07:21:22 +0000
Subject: [PATCH 1/2] Disable Wifi BugReport for subsystem restart

Flag: EXEMPT gated by overlay
Bug: 373594936
Test: Manuel test, trigger SSR and won't create bugreport automatically
Change-Id: I968f55519f7e9e1fda6731299b60f5acb50a9e90
---
 rro_overlays/WifiOverlay/res/values/config.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index b8209682..c8802a65 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -197,4 +197,6 @@
          false: firmware roaming will not be affected. -->
     <bool translatable="false" name ="config_wifiDisableFirmwareRoamingInIdleMode">true</bool>
 
+    <!-- Boolean indicating whether to trigger bugreport for WiFi subsystem restart issue -->
+    <bool translatable="false" name ="config_wifi_subsystem_restart_bugreport_enabled">false</bool>
 </resources>

From b8d7b1d465afcf51fb088f795d6f76f29b0e8dd2 Mon Sep 17 00:00:00 2001
From: Wayne Lin <waynewhlin@google.com>
Date: Tue, 19 Nov 2024 06:14:21 +0000
Subject: [PATCH 2/2] Revert "gps: set default SUPL SSL method to SSLv23"

Revert submission 30245457-b372373466_set-SSLv23-default-for-SUPL

Reason for revert: SUPL SI failure

Test: SI SUPL Test

Reverted changes: /q/submissionid:30245457-b372373466_set-SSLv23-default-for-SUPL

Bug: 379788380
Change-Id: I70b3510aeb24c383b815679199b9f7f094de7c6f
---
 location/caiman/user/gps.cfg             | 3 ++-
 location/caiman/userdebug/gps.cfg        | 3 ++-
 location/komodo/user/gps.cfg             | 3 ++-
 location/komodo/userdebug/gps.cfg        | 3 ++-
 location/ripcurrent24/user/gps.cfg       | 3 ++-
 location/ripcurrent24/userdebug/gps.cfg  | 3 ++-
 location/ripcurrentpro/user/gps.cfg      | 3 ++-
 location/ripcurrentpro/userdebug/gps.cfg | 3 ++-
 location/tokay/user/gps.cfg              | 3 ++-
 location/tokay/userdebug/gps.cfg         | 3 ++-
 10 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/location/caiman/user/gps.cfg b/location/caiman/user/gps.cfg
index 216da25a..d329a77b 100644
--- a/location/caiman/user/gps.cfg
+++ b/location/caiman/user/gps.cfg
@@ -114,7 +114,7 @@ ENABLE_4G_UP_CAPS_MSA=1
 ENABLE_4G_UP_CAPS_MSB=1
 ENABLE_5G_UP_CAPS_MSA=0
 ENABLE_5G_UP_CAPS_MSB=0
-SUPL_SSL_METHOD=SSLv23
+SUPL_SSL_METHOD=TLSv1_1
 SUPL_HMAC_HASH=SHA256
 SUPL_UT2_SEC=20
 SUPL_UT3_SEC=20
@@ -143,6 +143,7 @@ ENABLE_LPP_HA_GAD_SHAPE=1
 GNSS_CARRIER_ID=3
 ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
+SUPL_SSL_METHOD=TLSv1_2
 SUPL_UT2_SEC=10
 SUPL_UT3_SEC=30
 
diff --git a/location/caiman/userdebug/gps.cfg b/location/caiman/userdebug/gps.cfg
index 935f7e4c..61c7f3ed 100644
--- a/location/caiman/userdebug/gps.cfg
+++ b/location/caiman/userdebug/gps.cfg
@@ -277,7 +277,7 @@ ENABLE_4G_UP_CAPS_MSA=1
 ENABLE_4G_UP_CAPS_MSB=1
 ENABLE_5G_UP_CAPS_MSA=0
 ENABLE_5G_UP_CAPS_MSB=0
-SUPL_SSL_METHOD=SSLv23
+SUPL_SSL_METHOD=TLSv1_1
 SUPL_HMAC_HASH=SHA256
 SUPL_UT2_SEC=20
 SUPL_UT3_SEC=20
@@ -306,6 +306,7 @@ ENABLE_LPP_HA_GAD_SHAPE=1
 GNSS_CARRIER_ID=3
 ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
+SUPL_SSL_METHOD=TLSv1_2
 SUPL_UT2_SEC=10
 SUPL_UT3_SEC=30
 # AIRTEL
diff --git a/location/komodo/user/gps.cfg b/location/komodo/user/gps.cfg
index 7cb8c459..f9e6e7c6 100644
--- a/location/komodo/user/gps.cfg
+++ b/location/komodo/user/gps.cfg
@@ -114,7 +114,7 @@ ENABLE_4G_UP_CAPS_MSA=1
 ENABLE_4G_UP_CAPS_MSB=1
 ENABLE_5G_UP_CAPS_MSA=0
 ENABLE_5G_UP_CAPS_MSB=0
-SUPL_SSL_METHOD=SSLv23
+SUPL_SSL_METHOD=TLSv1_1
 SUPL_HMAC_HASH=SHA256
 SUPL_UT2_SEC=20
 SUPL_UT3_SEC=20
@@ -143,6 +143,7 @@ ENABLE_LPP_HA_GAD_SHAPE=1
 GNSS_CARRIER_ID=3
 ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
+SUPL_SSL_METHOD=TLSv1_2
 SUPL_UT2_SEC=10
 SUPL_UT3_SEC=30
 
diff --git a/location/komodo/userdebug/gps.cfg b/location/komodo/userdebug/gps.cfg
index bb3b5028..3aae35e8 100644
--- a/location/komodo/userdebug/gps.cfg
+++ b/location/komodo/userdebug/gps.cfg
@@ -277,7 +277,7 @@ ENABLE_4G_UP_CAPS_MSA=1
 ENABLE_4G_UP_CAPS_MSB=1
 ENABLE_5G_UP_CAPS_MSA=0
 ENABLE_5G_UP_CAPS_MSB=0
-SUPL_SSL_METHOD=SSLv23
+SUPL_SSL_METHOD=TLSv1_1
 SUPL_HMAC_HASH=SHA256
 SUPL_UT2_SEC=20
 SUPL_UT3_SEC=20
@@ -306,6 +306,7 @@ ENABLE_LPP_HA_GAD_SHAPE=1
 GNSS_CARRIER_ID=3
 ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
+SUPL_SSL_METHOD=TLSv1_2
 SUPL_UT2_SEC=10
 SUPL_UT3_SEC=30
 # AIRTEL
diff --git a/location/ripcurrent24/user/gps.cfg b/location/ripcurrent24/user/gps.cfg
index 6fbc5947..bd26a81f 100644
--- a/location/ripcurrent24/user/gps.cfg
+++ b/location/ripcurrent24/user/gps.cfg
@@ -106,7 +106,7 @@ ENABLE_4G_UP_CAPS_MSA=1
 ENABLE_4G_UP_CAPS_MSB=1
 ENABLE_5G_UP_CAPS_MSA=0
 ENABLE_5G_UP_CAPS_MSB=0
-SUPL_SSL_METHOD=SSLv23
+SUPL_SSL_METHOD=TLSv1_1
 SUPL_HMAC_HASH=SHA256
 SUPL_UT2_SEC=20
 SUPL_UT3_SEC=20
@@ -135,6 +135,7 @@ ENABLE_LPP_HA_GAD_SHAPE=1
 GNSS_CARRIER_ID=3
 ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
+SUPL_SSL_METHOD=TLSv1_2
 SUPL_UT2_SEC=10
 SUPL_UT3_SEC=30
 
diff --git a/location/ripcurrent24/userdebug/gps.cfg b/location/ripcurrent24/userdebug/gps.cfg
index 10671b37..f6ff481f 100644
--- a/location/ripcurrent24/userdebug/gps.cfg
+++ b/location/ripcurrent24/userdebug/gps.cfg
@@ -268,7 +268,7 @@ ENABLE_4G_UP_CAPS_MSA=1
 ENABLE_4G_UP_CAPS_MSB=1
 ENABLE_5G_UP_CAPS_MSA=0
 ENABLE_5G_UP_CAPS_MSB=0
-SUPL_SSL_METHOD=SSLv23
+SUPL_SSL_METHOD=TLSv1_1
 SUPL_HMAC_HASH=SHA256
 SUPL_UT2_SEC=20
 SUPL_UT3_SEC=20
@@ -297,6 +297,7 @@ ENABLE_LPP_HA_GAD_SHAPE=1
 GNSS_CARRIER_ID=3
 ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
+SUPL_SSL_METHOD=TLSv1_2
 SUPL_UT2_SEC=10
 SUPL_UT3_SEC=30
 # AIRTEL
diff --git a/location/ripcurrentpro/user/gps.cfg b/location/ripcurrentpro/user/gps.cfg
index 6fbc5947..bd26a81f 100644
--- a/location/ripcurrentpro/user/gps.cfg
+++ b/location/ripcurrentpro/user/gps.cfg
@@ -106,7 +106,7 @@ ENABLE_4G_UP_CAPS_MSA=1
 ENABLE_4G_UP_CAPS_MSB=1
 ENABLE_5G_UP_CAPS_MSA=0
 ENABLE_5G_UP_CAPS_MSB=0
-SUPL_SSL_METHOD=SSLv23
+SUPL_SSL_METHOD=TLSv1_1
 SUPL_HMAC_HASH=SHA256
 SUPL_UT2_SEC=20
 SUPL_UT3_SEC=20
@@ -135,6 +135,7 @@ ENABLE_LPP_HA_GAD_SHAPE=1
 GNSS_CARRIER_ID=3
 ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
+SUPL_SSL_METHOD=TLSv1_2
 SUPL_UT2_SEC=10
 SUPL_UT3_SEC=30
 
diff --git a/location/ripcurrentpro/userdebug/gps.cfg b/location/ripcurrentpro/userdebug/gps.cfg
index 10671b37..f6ff481f 100644
--- a/location/ripcurrentpro/userdebug/gps.cfg
+++ b/location/ripcurrentpro/userdebug/gps.cfg
@@ -268,7 +268,7 @@ ENABLE_4G_UP_CAPS_MSA=1
 ENABLE_4G_UP_CAPS_MSB=1
 ENABLE_5G_UP_CAPS_MSA=0
 ENABLE_5G_UP_CAPS_MSB=0
-SUPL_SSL_METHOD=SSLv23
+SUPL_SSL_METHOD=TLSv1_1
 SUPL_HMAC_HASH=SHA256
 SUPL_UT2_SEC=20
 SUPL_UT3_SEC=20
@@ -297,6 +297,7 @@ ENABLE_LPP_HA_GAD_SHAPE=1
 GNSS_CARRIER_ID=3
 ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
+SUPL_SSL_METHOD=TLSv1_2
 SUPL_UT2_SEC=10
 SUPL_UT3_SEC=30
 # AIRTEL
diff --git a/location/tokay/user/gps.cfg b/location/tokay/user/gps.cfg
index 3c8f0abf..cf7ed87e 100644
--- a/location/tokay/user/gps.cfg
+++ b/location/tokay/user/gps.cfg
@@ -114,7 +114,7 @@ ENABLE_4G_UP_CAPS_MSA=1
 ENABLE_4G_UP_CAPS_MSB=1
 ENABLE_5G_UP_CAPS_MSA=0
 ENABLE_5G_UP_CAPS_MSB=0
-SUPL_SSL_METHOD=SSLv23
+SUPL_SSL_METHOD=TLSv1_1
 SUPL_HMAC_HASH=SHA256
 SUPL_UT2_SEC=20
 SUPL_UT3_SEC=20
@@ -143,6 +143,7 @@ ENABLE_LPP_HA_GAD_SHAPE=1
 GNSS_CARRIER_ID=3
 ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
+SUPL_SSL_METHOD=TLSv1_2
 SUPL_UT2_SEC=10
 SUPL_UT3_SEC=30
 
diff --git a/location/tokay/userdebug/gps.cfg b/location/tokay/userdebug/gps.cfg
index 75a6cdb0..1389d995 100644
--- a/location/tokay/userdebug/gps.cfg
+++ b/location/tokay/userdebug/gps.cfg
@@ -277,7 +277,7 @@ ENABLE_4G_UP_CAPS_MSA=1
 ENABLE_4G_UP_CAPS_MSB=1
 ENABLE_5G_UP_CAPS_MSA=0
 ENABLE_5G_UP_CAPS_MSB=0
-SUPL_SSL_METHOD=SSLv23
+SUPL_SSL_METHOD=TLSv1_1
 SUPL_HMAC_HASH=SHA256
 SUPL_UT2_SEC=20
 SUPL_UT3_SEC=20
@@ -306,6 +306,7 @@ ENABLE_LPP_HA_GAD_SHAPE=1
 GNSS_CARRIER_ID=3
 ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
+SUPL_SSL_METHOD=TLSv1_2
 SUPL_UT2_SEC=10
 SUPL_UT3_SEC=30
 # AIRTEL