From de1185ae17c5ddea220fb5fd26384bfba9ce0ed4 Mon Sep 17 00:00:00 2001
From: kensun <kensun@google.com>
Date: Thu, 27 Jul 2023 14:51:06 +0000
Subject: [PATCH 1/2] wifi: enable SAE upgrade offload.

Bug: 292208673
Test: Cross AKM test.
Change-Id: If583bb4a9cdf76a5870285beef39e1507851fa74
---
 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 762a964..3fdade0 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -157,6 +157,8 @@
          for SAP, WFD GO, Wi-Fi Aware -->
     <bool translatable="false" name="config_wifiEnableStaDfsChannelForPeerNetwork">true</bool>
 
+    <!-- Enable WPA2 to WPA3 auto-upgrade offload to capable Driver/Firmware -->
+    <bool translatable="false" name="config_wifiSaeUpgradeOffloadEnabled">true</bool>
     <!-- Enable the feature of adjusting link layer stats polling interval based on
     device mobility state and client mode RSSI monitoring. -->
     <bool translatable="false" name="config_wifiAdjustPollRssiIntervalEnabled">true</bool>

From dd1c54ce39f0a3e47b846d52d982ca3d92233a62 Mon Sep 17 00:00:00 2001
From: Cheng Chang <chengcha@google.com>
Date: Thu, 27 Jul 2023 05:58:43 +0000
Subject: [PATCH 2/2] gps: add thread limitation

Bug: 291240107
Test: verify the assertion when amount of thread over value.
Change-Id: I994ec8687913fbdbe8470f03ecbbeddb198a25d8
---
 location/gps.xml          | 1 +
 location/gps.xml.hk3      | 1 +
 location/gps.xml.sb3      | 1 +
 location/gps_user.xml     | 1 +
 location/gps_user.xml.hk3 | 1 +
 location/gps_user.xml.sb3 | 1 +
 6 files changed, 6 insertions(+)

diff --git a/location/gps.xml b/location/gps.xml
index 64f6336..87364f4 100644
--- a/location/gps.xml
+++ b/location/gps.xml
@@ -61,6 +61,7 @@
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
+       MaxThreadNum="13"
   />
 
   <gll
diff --git a/location/gps.xml.hk3 b/location/gps.xml.hk3
index 0e1d7f6..76c61b0 100644
--- a/location/gps.xml.hk3
+++ b/location/gps.xml.hk3
@@ -61,6 +61,7 @@
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
+       MaxThreadNum="13"
   />
 
   <gll
diff --git a/location/gps.xml.sb3 b/location/gps.xml.sb3
index dcb56ff..4a011fa 100644
--- a/location/gps.xml.sb3
+++ b/location/gps.xml.sb3
@@ -61,6 +61,7 @@
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
+       MaxThreadNum="13"
   />
 
   <gll
diff --git a/location/gps_user.xml b/location/gps_user.xml
index c082719..5ae707e 100644
--- a/location/gps_user.xml
+++ b/location/gps_user.xml
@@ -60,6 +60,7 @@
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
+       MaxThreadNum="13"
   />
 
   <gll
diff --git a/location/gps_user.xml.hk3 b/location/gps_user.xml.hk3
index 968fb0a..8baba1d 100644
--- a/location/gps_user.xml.hk3
+++ b/location/gps_user.xml.hk3
@@ -60,6 +60,7 @@
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
+       MaxThreadNum="13"
   />
 
   <gll
diff --git a/location/gps_user.xml.sb3 b/location/gps_user.xml.sb3
index 34a2a04..aee51dc 100644
--- a/location/gps_user.xml.sb3
+++ b/location/gps_user.xml.sb3
@@ -60,6 +60,7 @@
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
+       MaxThreadNum="13"
   />
 
   <gll