diff options
| author | Ahmed ElArabawy <arabawy@google.com> | 2020-01-07 17:57:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-01-07 17:57:23 +0000 |
| commit | 6b1382ee47c2853c8b8cf4a44797c0344e20835b (patch) | |
| tree | 6eb539e3bc691bed347d7edae61105512be12841 /service | |
| parent | 74ac9617b7ecbe2f2faeaf98d55938844a84d58e (diff) | |
| parent | 2fd701c4551674087e911468db3e464d567bc8f5 (diff) | |
Merge "Add 802.11ax softAp parameters in overlay file"
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/HostapdHal.java | 15 | ||||
| -rw-r--r-- | service/res/values/config.xml | 15 | ||||
| -rw-r--r-- | service/res/values/overlayable.xml | 7 |
3 files changed, 36 insertions, 1 deletions
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 7817ccd8f..f87eaf949 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" /> |