From d68e86e6eafeb603edd9bac913420f3e59fc676c Mon Sep 17 00:00:00 2001
From: Victor Hsu <hsuvictor@google.com>
Date: Sat, 11 Feb 2023 11:01:53 +0800
Subject: [PATCH] wifi: Add PixelWifiOverlay2024_midyear and update default
 values

Disable STA+STA and AP+AP concurrency

Bug: 263717518
Test: Overlay can be read correctly
Change-Id: Iba00daa6b19fb4ccbd6a3a9449fd1458917dc029
---
 device-akita.mk                                |  3 +--
 rro_overlays/WifiOverlay/res/values/config.xml | 12 ------------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/device-akita.mk b/device-akita.mk
index 9790483..0caa7b6 100644
--- a/device-akita.mk
+++ b/device-akita.mk
@@ -155,8 +155,7 @@ PRODUCT_SOONG_NAMESPACES += \
 
 # WiFi Overlay
 PRODUCT_PACKAGES += \
-	WifiOverlay2024Mid \
-	PixelWifiOverlay2023
+	WifiOverlay2024Mid
 
 # Trusty liboemcrypto.so
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/akita/prebuilts
diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index eb1dc80..fd96242 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -112,18 +112,6 @@
     <!-- Enable adding minimum confirmation duration when sending network score to connectivity service. -->
     <bool translatable="false" name="config_wifiMinConfirmationDurationSendNetworkScoreEnabled">true</bool>
 
-    <!-- Enable concurrent STA + STA peer to peer + internet connectivity -->
-    <bool translatable="false" name="config_wifiMultiStaLocalOnlyConcurrencyEnabled">true</bool>
-
-    <!-- Enable concurrent STA + STA MBB support -->
-    <bool translatable="false" name="config_wifiMultiStaNetworkSwitchingMakeBeforeBreakEnabled">true</bool>
-
-    <!-- Enable concurrent Bridged access point (AP) support -->
-    <bool translatable="false" name="config_wifiBridgedSoftApSupported">true</bool>
-
-    <!-- Enable concurrent STA + Bridged access point (AP) support -->
-    <bool translatable="false" name="config_wifiStaWithBridgedSoftApConcurrencySupported">true</bool>
-
     <!-- Indicates that SAE Hash-to-Element is supported on this device -->
     <bool translatable="false" name="config_wifiSaeH2eSupported">true</bool>