From f7088056cbc4e59e5343dc8d0d0fe51436ff8d73 Mon Sep 17 00:00:00 2001
From: Cyan_Hsieh <cyanhsieh@google.com>
Date: Tue, 20 Feb 2024 09:46:32 +0800
Subject: [PATCH 1/2] Update SVN to 2

Bug: 325984251
Change-Id: I4168280d9d39eddeb101bedb99b2d81df57eeb8f
---
 device-akita.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device-akita.mk b/device-akita.mk
index e7946c3..aec9c92 100644
--- a/device-akita.mk
+++ b/device-akita.mk
@@ -357,7 +357,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=1
+    ro.vendor.build.svn=2
 
 # Keyboard height ratio and bottom padding in dp for portrait mode
 PRODUCT_PRODUCT_PROPERTIES += \

From ce570c9909ac019606e6a95195c810331d655bfb Mon Sep 17 00:00:00 2001
From: Hsiu-Chang Chen <hsiuchangchen@google.com>
Date: Mon, 19 Feb 2024 16:06:46 +0800
Subject: [PATCH 2/2] wifi: Disable firmware roaming in idle mode

Add a configurable overlay to control a whether to disable firmware
roaming when the device goes into idle mode.

When the feature is enabled, all STA ifaces will disable firmware
roaming upon entering idle mode. Upon exiting idle mode, all STAs except
ones being used for the local-only use-case will re-enable firmware
roaming.

Bug: 318309862
Test: Firmware roaming enables/disables as intended
Change-Id: I8d0e5d4023bc8a8c314ea9333ce22d24c499dd25
---
 rro_overlays/WifiOverlay/res/values/config.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index 6dbdd65..f43162c 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -165,4 +165,10 @@
     <!-- Configure the max number of new channels to add into the initial partial scan list per network.
          If equals to 0, it means there's no limit on the max number of channels to include per network.-->
     <integer translatable="false" name="config_wifiInitialPartialScanMaxNewChannelsPerNetwork">3</integer>
+
+    <!-- Boolean indicating whether to disable firmware roaming when the device goes into idle mode.
+         true: firmware roaming will be disabled when the device goes into idle mode, and then
+               re-activated when the device exits idle mode.
+         false: firmware roaming will not be affected. -->
+    <bool translatable="false" name ="config_wifiDisableFirmwareRoamingInIdleMode">true</bool>
 </resources>