From 846a5a7fd81a35343eacb178eb7d48b7cb14285a Mon Sep 17 00:00:00 2001
From: Isaac Chiou <isaacchiou@google.com>
Date: Fri, 1 Nov 2024 07:19:13 +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: I6e985866363038d36d79e969d7c50f0d6d29cf5e
---
 rro_overlays/WifiOverlay/res/values/config.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index ff45641..90eac04 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -171,4 +171,7 @@
                re-activated when the device exits idle mode.
          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 d1b426364209f4b3bf311ac6a1d953df84bedc81 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

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

Bug: 379788380
Change-Id: I7ab274e27071554f47a9eae999efa6357f3e16a0
---
 location/gnssd/release/gps.cfg      | 3 ++-
 location/gnssd/release/gps_user.cfg | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/location/gnssd/release/gps.cfg b/location/gnssd/release/gps.cfg
index 8e67133..fc32a7e 100644
--- a/location/gnssd/release/gps.cfg
+++ b/location/gnssd/release/gps.cfg
@@ -208,7 +208,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
@@ -235,6 +235,7 @@ ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
 SUPL_UT2_SEC=10
 SUPL_UT3_SEC=30
+SUPL_SSL_METHOD=TLSv1_2
 # AIRTEL
 GNSS_CARRIER_ID=4
 # RAKUTEN
diff --git a/location/gnssd/release/gps_user.cfg b/location/gnssd/release/gps_user.cfg
index 64aaa63..ed40ec5 100644
--- a/location/gnssd/release/gps_user.cfg
+++ b/location/gnssd/release/gps_user.cfg
@@ -90,7 +90,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
@@ -114,6 +114,7 @@ ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3
 SUPL_UT2_SEC=10
 SUPL_UT3_SEC=30
+SUPL_SSL_METHOD=TLSv1_2
 GNSS_CARRIER_ID=4
 GNSS_CARRIER_ID=5
 ENABLE_LPP_UP=1