diff options
| author | Purushottam Kushwaha <quic_pkushwah@quicinc.com> | 2020-05-20 20:07:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-20 20:07:57 +0000 |
| commit | 94382ddb9151598ae7628d2415a993359d500351 (patch) | |
| tree | 5c535f5c6c50e07c19e9f0727b7feb35ce90e7af /service | |
| parent | 743d0bbc70709735b0f3d0ae93336e98394f5bc1 (diff) | |
| parent | 9f4633944734f0205ebf16c205147f7d21ad6f3d (diff) | |
SoftAp: Add support to configure acsShouldExcludeDfs. am: 0715666c96 am: 9f46339447
Change-Id: I56f0e0558a473e8bf711c5e1f12a23eeae2032d4
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/HostapdHal.java | 3 | ||||
| -rw-r--r-- | service/res/values/config.xml | 3 | ||||
| -rw-r--r-- | service/res/values/overlayable.xml | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/HostapdHal.java b/service/java/com/android/server/wifi/HostapdHal.java index 6ef0a7f86..1ff8368e3 100644 --- a/service/java/com/android/server/wifi/HostapdHal.java +++ b/service/java/com/android/server/wifi/HostapdHal.java @@ -424,7 +424,8 @@ public class HostapdHal { && !mForceApChannel; if (enableAcs) { ifaceParams.channelParams.enableAcs = true; - ifaceParams.channelParams.acsShouldExcludeDfs = true; + ifaceParams.channelParams.acsShouldExcludeDfs = !mContext.getResources() + .getBoolean(R.bool.config_wifiSoftapAcsIncludeDfs); } ifaceParams.channelParams.channel = mForceApChannel ? mForcedApChannel : config.getChannel(); diff --git a/service/res/values/config.xml b/service/res/values/config.xml index 5d8a47ca9..635b3ada1 100644 --- a/service/res/values/config.xml +++ b/service/res/values/config.xml @@ -414,4 +414,7 @@ <integer translatable="false" name="config_wifiMaxNativeFailureSelfRecoveryPerHour">2</integer> <!-- Ignore the open saved network if from carrier provisioning app, there is a same open suggestion and a secure suggestion from same carrier available --> <bool translatable="false" name="config_wifiIgnoreOpenSavedNetworkWhenSecureSuggestionAvailable">true</bool> + + <!-- Wifi driver Automatic channel selection (ACS) for softap to include DFS channels --> + <bool translatable="false" name="config_wifiSoftapAcsIncludeDfs">false</bool> </resources> diff --git a/service/res/values/overlayable.xml b/service/res/values/overlayable.xml index d0dd87525..52ef09e4f 100644 --- a/service/res/values/overlayable.xml +++ b/service/res/values/overlayable.xml @@ -130,6 +130,7 @@ <item type="bool" name="config_wifiSaeUpgradeOffloadEnabled" /> <item type="integer" name="config_wifiMaxNativeFailureSelfRecoveryPerHour" /> <item type="bool" name="config_wifiIgnoreOpenSavedNetworkWhenSecureSuggestionAvailable" /> + <item type="bool" name="config_wifiSoftapAcsIncludeDfs" /> <!-- Params from config.xml that can be overlayed --> <!-- Params from strings.xml that can be overlayed --> |