Merge "WiFi: Force 11be to false when 11ax is false." into main

1 files changed, 44 insertions, 0 deletions

diff --git a/framework/java/android/net/wifi/SoftApConfiguration.java b/framework/java/android/net/wifi/SoftApConfiguration.java
index 92efcf72cb..086c816b71 100644
--- a/framework/java/android/net/wifi/SoftApConfiguration.java
+++ b/framework/java/android/net/wifi/SoftApConfiguration.java
@@ -1426,6 +1426,45 @@ public final class SoftApConfiguration implements Parcelable {
             mIsClientIsolationEnabled = other.mIsClientIsolationEnabled;
         }
 
+       /**
+         * Builds the {@link SoftApConfiguration} without any check.
+         *
+         * @return A new {@link SoftApConfiguration}, as configured by previous method calls.
+         *
+         * @hide
+         */
+        @VisibleForTesting
+        @NonNull
+        public SoftApConfiguration buildWithoutCheck() {
+            return new SoftApConfiguration(
+                    mWifiSsid,
+                    mBssid,
+                    mPassphrase,
+                    mHiddenSsid,
+                    mChannels,
+                    mSecurityType,
+                    mMaxNumberOfClients,
+                    mAutoShutdownEnabled,
+                    mShutdownTimeoutMillis,
+                    mClientControlByUser,
+                    mBlockedClientList,
+                    mAllowedClientList,
+                    mMacRandomizationSetting,
+                    mBridgedModeOpportunisticShutdownEnabled,
+                    mIeee80211axEnabled,
+                    mIeee80211beEnabled,
+                    mIsUserConfiguration,
+                    mBridgedModeOpportunisticShutdownTimeoutMillis,
+                    mVendorElements,
+                    mPersistentRandomizedMacAddress,
+                    mAllowedAcsChannels2g,
+                    mAllowedAcsChannels5g,
+                    mAllowedAcsChannels6g,
+                    mMaxChannelBandwidth,
+                    mVendorData,
+                    mIsClientIsolationEnabled);
+        }
+
         /**
          * Builds the {@link SoftApConfiguration}.
          *
@@ -1451,6 +1490,11 @@ public final class SoftApConfiguration implements Parcelable {
                     REMOVE_ZERO_FOR_TIMEOUT_SETTING) && mShutdownTimeoutMillis == DEFAULT_TIMEOUT) {
                 mShutdownTimeoutMillis = 0; // Use 0 for legacy app.
             }
+
+            if (SdkLevel.isAtLeastB() && !mIeee80211axEnabled) {
+                // Force 11BE to false since 11ax has dependency with 11AX.
+                mIeee80211beEnabled = false;
+            }
             return new SoftApConfiguration(
                     mWifiSsid,
                     mBssid,