diff options
| author | Sunil Ravi <sunilravi@google.com> | 2020-03-22 17:32:35 -0700 |
|---|---|---|
| committer | Sunil Ravi <sunilravi@google.com> | 2020-03-22 17:32:35 -0700 |
| commit | d66d7953ed80e1ef044499b96ef404598b944021 (patch) | |
| tree | 5a314285c2bd6a0c162d8f32e37773bcc0fd885e /service | |
| parent | 06a5b1236b2defcef2b13959a1440d2f3dd5af2e (diff) | |
Blacklist the BSS only if MBO assoc retry delay is included.
When handling 802.11v bss transition request frame, blacklist
the bss only if MBO association retry delay is included.
Bug: 150579651
Test: Manual - Basic wifi sanity test
Test: atest com.android.server.wifi.ClientModeImplTest
Change-Id: I7e87e66b95e352f64f5f9ed2c740c022b2400d26
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/ClientModeImpl.java | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java index 7cdc8e084..30d989491 100644 --- a/service/java/com/android/server/wifi/ClientModeImpl.java +++ b/service/java/com/android/server/wifi/ClientModeImpl.java @@ -6154,11 +6154,6 @@ public class ClientModeImpl extends StateMachine { return; } - boolean isImminentBit = (frameData.mBssTmDataFlagsMask - & (MboOceConstants.BTM_DATA_FLAG_DISASSOCIATION_IMMINENT - | MboOceConstants.BTM_DATA_FLAG_BSS_TERMINATION_INCLUDED - | MboOceConstants.BTM_DATA_FLAG_ESS_DISASSOCIATION_IMMINENT)) != 0; - if ((frameData.mBssTmDataFlagsMask & MboOceConstants.BTM_DATA_FLAG_MBO_CELL_DATA_CONNECTION_PREFERENCE_INCLUDED) != 0) { @@ -6166,12 +6161,13 @@ public class ClientModeImpl extends StateMachine { } - if (isImminentBit) { + if ((frameData.mBssTmDataFlagsMask + & MboOceConstants.BTM_DATA_FLAG_MBO_ASSOC_RETRY_DELAY_INCLUDED) + != 0) { long duration = frameData.mBlackListDurationMs; if (duration == 0) { /* - * When AP sets one of the imminent bits and disassociation timer / BSS termination - * duration / MBO assoc retry delay is set to zero(reserved as per spec), + * When MBO assoc retry delay is set to zero(reserved as per spec), * blacklist the BSS for sometime to avoid AP rejecting the re-connect request. */ duration = MboOceConstants.DEFAULT_BLACKLIST_DURATION_MS; |