From 79756404aa695e68fdb75d9306d6c7a3cc2a10af Mon Sep 17 00:00:00 2001
From: Isaac Chiou <isaacchiou@google.com>
Date: Fri, 8 Nov 2024 09:04:51 +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: I92b0a55d8fb2d287ab359389b6bdf5e6eaba0e11
---
 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 bbec9df..49fe3c4 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -193,4 +193,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 7d4e309af6330436fef1915a7f5518d95d5695f4 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: I1cac110cfe524f1e8cf0989711a92d8133739cad
---
 location/user/gps.cfg      | 3 ++-
 location/userdebug/gps.cfg | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/location/user/gps.cfg b/location/user/gps.cfg
index f60a472..d41a982 100644
--- a/location/user/gps.cfg
+++ b/location/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/userdebug/gps.cfg b/location/userdebug/gps.cfg
index ea6e850..0641d1f 100644
--- a/location/userdebug/gps.cfg
+++ b/location/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