From 2fd701c4551674087e911468db3e464d567bc8f5 Mon Sep 17 00:00:00 2001
From: Ahmed ElArabawy <arabawy@google.com>
Date: Thu, 2 Jan 2020 14:18:38 -0800
Subject: Add 802.11ax softAp parameters in overlay file

This commit adds SoftAp configuration parameters in the overlay file,
and pass it through the Hidl interface.

Bug: 141831296
Test: atest com.android.wifi.server
Change-Id: I2db74c81cc1108abb354c1df5a5ed25311159ecc
---
 service/java/com/android/server/wifi/HostapdHal.java | 15 +++++++++++++++
 service/res/values/config.xml                        | 15 +++++++++++++++
 service/res/values/overlayable.xml                   |  7 ++++++-
 3 files changed, 36 insertions(+), 1 deletion(-)

(limited to 'service')

diff --git a/service/java/com/android/server/wifi/HostapdHal.java b/service/java/com/android/server/wifi/HostapdHal.java
index 52f8e8edd..d7b6d3c0c 100644
--- a/service/java/com/android/server/wifi/HostapdHal.java
+++ b/service/java/com/android/server/wifi/HostapdHal.java
@@ -424,6 +424,21 @@ public class HostapdHal {
                         ifaceParams1_2.hwModeParams.enable6GhzBand =
                                 mContext.getResources().getBoolean(
                                     R.bool.config_wifiSoftap6ghzSupported);
+                        ifaceParams1_2.hwModeParams.enableHeSingleUserBeamformer =
+                                mContext.getResources().getBoolean(
+                                    R.bool.config_wifiSoftapHeSuBeamformerSupported);
+                        ifaceParams1_2.hwModeParams.enableHeSingleUserBeamformee =
+                                mContext.getResources().getBoolean(
+                                    R.bool.config_wifiSoftapHeSuBeamformeeSupported);
+                        ifaceParams1_2.hwModeParams.enableHeMultiUserBeamformer =
+                                mContext.getResources().getBoolean(
+                                    R.bool.config_wifiSoftapHeMuBeamformerSupported);
+                        ifaceParams1_2.hwModeParams.heBssColor =
+                                mContext.getResources().getInteger(
+                                    R.integer.config_wifiSoftapHeBssColor);
+                        ifaceParams1_2.hwModeParams.enableHeTargetWakeTime =
+                                mContext.getResources().getBoolean(
+                                    R.bool.config_wifiSoftapHeTwtSupported);
                         ifaceParams1_2.channelParams.bandMask = getHalBandMask(band);
 
                         android.hardware.wifi.hostapd.V1_2.IHostapd iHostapdV1_2 =
diff --git a/service/res/values/config.xml b/service/res/values/config.xml
index 29cd63456..15dcf0a42 100644
--- a/service/res/values/config.xml
+++ b/service/res/values/config.xml
@@ -172,6 +172,21 @@
     <!-- Wifi driver supports IEEE80211AX for softap -->
     <bool translatable="false" name="config_wifiSoftapIeee80211axSupported">false</bool>
 
+    <!-- Wifi driver supports IEEE80211AX single user beamformer for softap -->
+    <bool translatable="false" name="config_wifiSoftapHeSuBeamformerSupported">false</bool>
+
+    <!-- Wifi driver supports IEEE80211AX single user beamformee for softap -->
+    <bool translatable="false" name="config_wifiSoftapHeSuBeamformeeSupported">false</bool>
+
+    <!-- Wifi driver supports IEEE80211AX multiple user beamformer for softap -->
+    <bool translatable="false" name="config_wifiSoftapHeMuBeamformerSupported">false</bool>
+
+    <!-- Wifi driver IEEE80211AX bss color for softap -->
+    <integer translatable="false" name="config_wifiSoftapHeBssColor">0</integer>
+
+    <!-- Wifi driver supports IEEE80211AX TWT (Target Wake Time) for softap -->
+    <bool translatable="false" name="config_wifiSoftapHeTwtSupported">false</bool>
+
     <!-- Wifi driver supports 6GHz band for softap -->
     <bool translatable="false" name="config_wifiSoftap6ghzSupported">false</bool>
 
diff --git a/service/res/values/overlayable.xml b/service/res/values/overlayable.xml
index ca12ec3b1..8cac3d737 100644
--- a/service/res/values/overlayable.xml
+++ b/service/res/values/overlayable.xml
@@ -70,6 +70,11 @@
           <item type="bool" name="config_wifi_softap_ieee80211ac_supported" />
           <item type="bool" name="config_wifiSoftapIeee80211axSupported" />
           <item type="bool" name="config_wifiSoftap6ghzSupported" />
+          <item type="bool" name="config_wifiSoftapHeSuBeamformerSupported" />
+          <item type="bool" name="config_wifiSoftapHeSuBeamformeeSupported" />
+          <item type="bool" name="config_wifiSoftapHeMuBeamformerSupported" />
+          <item type="integer" name="config_wifiSoftapHeBssColor" />
+          <item type="bool" name="config_wifiSoftapHeTwtSupported" />
           <item type="bool" name="config_wifi_local_only_hotspot_5ghz" />
           <item type="bool" name="config_wifi_connected_mac_randomization_supported" />
           <item type="bool" name="config_wifi_p2p_mac_randomization_supported" />
@@ -78,7 +83,7 @@
           <item type="array" name="config_wifi_aggressive_randomization_ssid_blocklist" />
           <item type="bool" name="config_wifi_link_probing_supported" />
           <item type="bool" name="config_wifi_11ax_supported" />
-          <item type="bool" name="config_wifi_contiguous_160mhz_supported" />
+         <item type="bool" name="config_wifi_contiguous_160mhz_supported" />
           <item type="integer" name="config_wifi_max_num_spatial_stream_supported" />
           <item type="string" name="config_wifi_tcp_buffers" />
           <item type="string" name="wifi_tether_configure_ssid_default" />
-- 
cgit v1.2.3