diff options
| author | David Su <dysu@google.com> | 2019-11-01 17:39:58 -0700 |
|---|---|---|
| committer | David Su <dysu@google.com> | 2019-11-25 13:51:39 -0800 |
| commit | e9ca771b14af30d6618b5ef55fd6b8021c88f5f3 (patch) | |
| tree | b55d887fb98e27798622cd6a02b74ce3082dd89a /tests | |
| parent | 56c2e61f20de962dbcd743ef441086671b5001f0 (diff) | |
Moved Network Selection Disable Reason constants
Moved WifiConfigManager.NETWORK_SELECTION_DISABLE_THRESHOLD,
WifiConfigManager.NETWORK_SELECTION_DISABLE_TIMEOUT_MS
to WifiConfiguration so that it will be updated whenever
the error codes in
NetworkSelectionStatus.NetworkSelectionDisableReason
are changed.
Bug: 143892601
Test: atest FrameworksWifiTests
Change-Id: I94c5c6e6ab7334950568da4ef8a29625a8a5bc60
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java b/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java index b62bb12db..0e4d049de 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java @@ -1031,7 +1031,7 @@ public class WifiConfigManagerTest extends WifiBaseTest { // disable it 5 times to actually mark it temporarily disabled. int assocRejectReason = NetworkSelectionStatus.DISABLED_ASSOCIATION_REJECTION; int assocRejectThreshold = - WifiConfigManager.NETWORK_SELECTION_DISABLE_THRESHOLD[assocRejectReason]; + WifiConfigManager.getNetworkSelectionDisableThreshold(assocRejectReason); for (int i = 1; i <= assocRejectThreshold; i++) { verifyUpdateNetworkSelectionStatus(result.getNetworkId(), assocRejectReason, i); } @@ -1127,7 +1127,7 @@ public class WifiConfigManagerTest extends WifiBaseTest { result.getNetworkId(), NetworkSelectionStatus.NETWORK_SELECTION_ENABLE, 0); int disableThreshold = - WifiConfigManager.NETWORK_SELECTION_DISABLE_THRESHOLD[reason]; + WifiConfigManager.getNetworkSelectionDisableThreshold(reason); for (int i = 1; i <= disableThreshold; i++) { verifyUpdateNetworkSelectionStatus(result.getNetworkId(), reason, i); } @@ -1170,7 +1170,7 @@ public class WifiConfigManagerTest extends WifiBaseTest { int numBssidsInBlocklist = i; when(mBssidBlocklistMonitor.getNumBlockedBssidsForSsid(anyString())) .thenReturn(numBssidsInBlocklist); - timeout = WifiConfigManager.NETWORK_SELECTION_DISABLE_TIMEOUT_MS[disableReason] + timeout = WifiConfigManager.getNetworkSelectionDisableTimeoutMillis(disableReason) * multiplier; multiplier *= 2; verifyNetworkIsEnabledAfter(result.getNetworkId(), @@ -2602,7 +2602,7 @@ public class WifiConfigManagerTest extends WifiBaseTest { // disable it 5 times to actually mark it temporarily disabled. int assocRejectReason = NetworkSelectionStatus.DISABLED_ASSOCIATION_REJECTION; int assocRejectThreshold = - WifiConfigManager.NETWORK_SELECTION_DISABLE_THRESHOLD[assocRejectReason]; + WifiConfigManager.getNetworkSelectionDisableThreshold(assocRejectReason); for (int i = 1; i <= assocRejectThreshold; i++) { verifyUpdateNetworkSelectionStatus(result1.getNetworkId(), assocRejectReason, i); } @@ -5417,7 +5417,7 @@ public class WifiConfigManagerTest extends WifiBaseTest { long retrievedDisableTime = retrievedStatus.getDisableTime(); int retrievedDisableReasonCounter = retrievedStatus.getDisableReasonCounter(reason); int disableReasonThreshold = - WifiConfigManager.NETWORK_SELECTION_DISABLE_THRESHOLD[reason]; + WifiConfigManager.getNetworkSelectionDisableThreshold(reason); if (reason == NetworkSelectionStatus.NETWORK_SELECTION_ENABLE) { assertEquals(reason, retrievedDisableReason); @@ -5592,7 +5592,7 @@ public class WifiConfigManagerTest extends WifiBaseTest { int assocRejectReason = NetworkSelectionStatus.DISABLED_ASSOCIATION_REJECTION; int assocRejectThreshold = - WifiConfigManager.NETWORK_SELECTION_DISABLE_THRESHOLD[assocRejectReason]; + WifiConfigManager.getNetworkSelectionDisableThreshold(assocRejectReason); for (int i = 1; i <= assocRejectThreshold; i++) { assertFalse(mWifiConfigManager.updateNetworkSelectionStatus( networkId, assocRejectReason)); |