From 68d3ff60223ca22c5ea9d7ef3453eb08cad76b07 Mon Sep 17 00:00:00 2001
From: Hsiu-Chang Chen <hsiuchangchen@google.com>
Date: Thu, 10 Aug 2023 00:10:43 +0800
Subject: [PATCH] wifi: Disable STA+SAP concurrency

Because the DBS feature is not ready yet, disable
STA+SAP concurrency to prevent unexpected behavior

Bug: 295128204
Test: STA and SAP cannot be enabled at the same time
Change-Id: Ie897696365c5eea451736be86631bb50118783fc
---
 device-akita.mk          | 4 ++++
 wifi/BoardConfig-wifi.mk | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/device-akita.mk b/device-akita.mk
index 19c50ae..0fa789f 100644
--- a/device-akita.mk
+++ b/device-akita.mk
@@ -267,3 +267,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
     ro.vendor.build.svn=1
+
+# Wifi SAP Interface Name
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.vendor.wifi.sap.interface=wlan1
diff --git a/wifi/BoardConfig-wifi.mk b/wifi/BoardConfig-wifi.mk
index 1035c0f..a941afa 100644
--- a/wifi/BoardConfig-wifi.mk
+++ b/wifi/BoardConfig-wifi.mk
@@ -23,7 +23,7 @@ BOARD_WPA_SUPPLICANT_DRIVER := NL80211
 BOARD_HOSTAPD_DRIVER := NL80211
 # Wifi interface combination - {1 STA + 1 AP} or {1 STA + 1 P2P}
 # or {1 STA + 1 NAN}
-WIFI_HAL_INTERFACE_COMBINATIONS := {{{STA}, 1}, {{P2P, NAN, AP}, 1}}
+WIFI_HAL_INTERFACE_COMBINATIONS := {{{STA}, 1}, {{P2P, NAN}, 1}}, {{{AP}, 1}}
 WIFI_FEATURE_WIFI_EXT_HAL := true
 WIFI_FEATURE_IMU_DETECTION := true
 # Avoid Wifi reset on MAC Address change