From b4817c60197a26e0dfeaf1a063f125ab05a9559d Mon Sep 17 00:00:00 2001
From: Hsiu-Chang Chen <hsiuchangchen@google.com>
Date: Sat, 19 Aug 2023 02:27:37 +0000
Subject: [PATCH] Revert "wifi: Disable STA+SAP concurrency"

This reverts commit 68d3ff60223ca22c5ea9d7ef3453eb08cad76b07.

Reason for revert: It causes hotspot cannot be enabled on OTA devices
Bug: 296140880
Test: Hotspot can be enabled after OTA

Change-Id: I19ae941bd552a86eccd7f36e810a0c2aff7dcfb9
---
 device-akita.mk          | 4 ----
 wifi/BoardConfig-wifi.mk | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/device-akita.mk b/device-akita.mk
index 0fa789f..19c50ae 100644
--- a/device-akita.mk
+++ b/device-akita.mk
@@ -267,7 +267,3 @@ 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 a941afa..1035c0f 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}, 1}}, {{{AP}, 1}}
+WIFI_HAL_INTERFACE_COMBINATIONS := {{{STA}, 1}, {{P2P, NAN, AP}, 1}}
 WIFI_FEATURE_WIFI_EXT_HAL := true
 WIFI_FEATURE_IMU_DETECTION := true
 # Avoid Wifi reset on MAC Address change