From 37b036a0ed8b956f77589654c3748ee6fbacedd1 Mon Sep 17 00:00:00 2001
From: Hana Huang <hanahuang@google.com>
Date: Fri, 12 Jul 2024 05:57:06 +0000
Subject: [PATCH 1/7] Wifi: Disable
 config_wifiEnableStaIndoorChannelForPeerNetwork

Bug: 351981809
Bug: 352658713
Test: AU drop/IFS/RvR/CTS/VTS/Manual Test, JP SAP indoor channel test
Change-Id: If2d46e2bbd7612e6cc6f80bc74c7870dea17e08d
Signed-off-by: Hana Huang <hanahuang@google.com>
---
 rro_overlays/WifiOverlay/res/values/config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index 61a2e7f..6519607 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -152,7 +152,7 @@
 
     <!-- Boolean indicating whether we should enable the STA current connected indoor channel
      for SAP, WFD GO, Wi-Fi Aware -->
-    <bool translatable="false" name="config_wifiEnableStaIndoorChannelForPeerNetwork">true</bool>
+    <bool translatable="false" name="config_wifiEnableStaIndoorChannelForPeerNetwork">false</bool>
     <!-- Boolean indicating whether we should enable the STA current connected DFS channel
          for SAP, WFD GO, Wi-Fi Aware -->
     <bool translatable="false" name="config_wifiEnableStaDfsChannelForPeerNetwork">true</bool>

From d9fa747d2582f885232423a464786d838d11b81a Mon Sep 17 00:00:00 2001
From: Ankur Bakshi <ankurbakshi@google.com>
Date: Mon, 15 Jul 2024 14:21:17 +0000
Subject: [PATCH 2/7] Update shiba SVN to 33

Bug: 352170103
Change-Id: I4ad3b7e298cf6ec12e2cfc8873a24492fd5c25df
Flag: EXEMPT bugfix
---
 device-shiba.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device-shiba.mk b/device-shiba.mk
index 06e190d..1543f85 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -383,7 +383,7 @@ ifdef RELEASE_SVN_SHIBA
 TARGET_SVN ?= $(RELEASE_SVN_SHIBA)
 else
 # Set this for older releases that don't use build flag
-TARGET_SVN ?= 32
+TARGET_SVN ?= 33
 endif
 
 PRODUCT_VENDOR_PROPERTIES += \

From a1e3e6cce330644fffac42cc04e7e607be88efa2 Mon Sep 17 00:00:00 2001
From: Ankur Bakshi <ankurbakshi@google.com>
Date: Mon, 15 Jul 2024 14:37:46 +0000
Subject: [PATCH 3/7] Update shiba SVN to 34

Bug: 352170103
Change-Id: I9c7a9f6da772ecee70b9022aa29e8a3ad0d130d4
Flag: EXEMPT bugfix
---
 device-shiba.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device-shiba.mk b/device-shiba.mk
index 1543f85..b50b027 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -383,7 +383,7 @@ ifdef RELEASE_SVN_SHIBA
 TARGET_SVN ?= $(RELEASE_SVN_SHIBA)
 else
 # Set this for older releases that don't use build flag
-TARGET_SVN ?= 33
+TARGET_SVN ?= 34
 endif
 
 PRODUCT_VENDOR_PROPERTIES += \

From 633317c02cf441e3fc03151ed15ecb72bd29fd98 Mon Sep 17 00:00:00 2001
From: Ankur Bakshi <ankurbakshi@google.com>
Date: Mon, 15 Jul 2024 14:39:27 +0000
Subject: [PATCH 4/7] Update shiba SVN to 35

Bug: 352170103
Change-Id: Ib5c55167cdc0bbae64e48adb6778c445a38e5cc1
Flag: EXEMPT bugfix
---
 device-shiba.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device-shiba.mk b/device-shiba.mk
index b50b027..a6b6093 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -383,7 +383,7 @@ ifdef RELEASE_SVN_SHIBA
 TARGET_SVN ?= $(RELEASE_SVN_SHIBA)
 else
 # Set this for older releases that don't use build flag
-TARGET_SVN ?= 34
+TARGET_SVN ?= 35
 endif
 
 PRODUCT_VENDOR_PROPERTIES += \

From 4b4f16c266ad592ed13c50202ce690c939410cdd Mon Sep 17 00:00:00 2001
From: Ankur Bakshi <ankurbakshi@google.com>
Date: Mon, 15 Jul 2024 14:41:20 +0000
Subject: [PATCH 5/7] Update husky SVN to 33

Bug: 352170103
Change-Id: I9beeef1b118a8d8a05ea14072e211d2f25eaf164
Flag: EXEMPT bugfix
---
 device-husky.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device-husky.mk b/device-husky.mk
index be6f0ee..b028444 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -406,7 +406,7 @@ ifdef RELEASE_SVN_HUSKY
 TARGET_SVN ?= $(RELEASE_SVN_HUSKY)
 else
 # Set this for older releases that don't use build flag
-TARGET_SVN ?= 32
+TARGET_SVN ?= 33
 endif
 
 PRODUCT_VENDOR_PROPERTIES += \

From c473353c4c58c6d178bedfec15d4d53595b941d5 Mon Sep 17 00:00:00 2001
From: Ankur Bakshi <ankurbakshi@google.com>
Date: Mon, 15 Jul 2024 14:43:18 +0000
Subject: [PATCH 6/7] Update husky SVN to 34

Bug: 352170103
Change-Id: Ieb8ec0e93b463e95787a3ceed0ed4cddf78b262a
Flag: EXEMPT bugfix
---
 device-husky.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device-husky.mk b/device-husky.mk
index b028444..0af4537 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -406,7 +406,7 @@ ifdef RELEASE_SVN_HUSKY
 TARGET_SVN ?= $(RELEASE_SVN_HUSKY)
 else
 # Set this for older releases that don't use build flag
-TARGET_SVN ?= 33
+TARGET_SVN ?= 34
 endif
 
 PRODUCT_VENDOR_PROPERTIES += \

From f5bb7a3f5605d94f482aeb7a50b842eb2e9a1942 Mon Sep 17 00:00:00 2001
From: Ankur Bakshi <ankurbakshi@google.com>
Date: Mon, 15 Jul 2024 14:46:05 +0000
Subject: [PATCH 7/7] Update husky SVN to 35

Bug: 352170103
Change-Id: I661546ae0ab104021936acd109e08de2a64a1b1c
Flag: EXEMPT bugfix
---
 device-husky.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device-husky.mk b/device-husky.mk
index 0af4537..1c1e3b0 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -406,7 +406,7 @@ ifdef RELEASE_SVN_HUSKY
 TARGET_SVN ?= $(RELEASE_SVN_HUSKY)
 else
 # Set this for older releases that don't use build flag
-TARGET_SVN ?= 34
+TARGET_SVN ?= 35
 endif
 
 PRODUCT_VENDOR_PROPERTIES += \