commit 50def6aab92aec27d1dd8a5390b7648eedd0bfe2
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Feb 17 16:21:06 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 17 16:21:06 2022 +0000
tree 6f0fcc7197104e7f2715fef976df59d1d7e1cc9a
parent 32370e015d85b3df19fb296504ebc33b360f30c8
parent 64314e5ffaa5950042e56f045c7d6e5d79deaf02

Merge "Reduce flakiness by allowing multiple scans - even if empty" into stage-aosp-sc-v2-ts-dev

tests/tests/wifi/src/android/net/wifi/cts/TestHelper.java

diff --git a/tests/tests/wifi/src/android/net/wifi/cts/TestHelper.java b/tests/tests/wifi/src/android/net/wifi/cts/TestHelper.java
index 98ab11d..c845138 100644
--- a/tests/tests/wifi/src/android/net/wifi/cts/TestHelper.java
+++ b/tests/tests/wifi/src/android/net/wifi/cts/TestHelper.java
@@ -146,7 +146,7 @@
                 wifiManager.unregisterScanResultsCallback(scanResultsCallback);
             }
             List<ScanResult> scanResults = wifiManager.getScanResults();
-            if (scanResults == null || scanResults.isEmpty()) fail("No scan results available");
+            if (scanResults == null || scanResults.isEmpty()) continue;
             for (ScanResult scanResult : scanResults) {
                 WifiConfiguration matchingNetwork = savedNetworks.stream()
                         .filter(network -> TextUtils.equals(