commit 67df08a557291ca4a1471ca646580d31e5ba6927
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Feb 14 14:37:35 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 14 14:37:35 2025 -0800
tree 52f3ddaa537422632fae43530b7c76f3154738e8
parent 12dde9832585a16ad9633d948ebfd469b6f355e6
parent d6ccb649b8833a668321d25d02ccbc74cb7e2f2f

Merge "Fix Flaky testTrafficStatsForLocalhost" into android14-tests-dev

tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java

diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
index 5d6615b..ff7cb48 100644
--- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -2202,8 +2202,10 @@
 
             // Verify that turning airplane mode off takes effect as expected.
             // connectToCell only registers a request, it cannot / does not need to be called twice
-            mCtsNetUtils.ensureWifiConnected();
-            if (verifyWifi) waitForAvailable(wifiCb);
+            if (verifyWifi) {
+                mCtsNetUtils.ensureWifiConnected();
+                waitForAvailable(wifiCb);
+            }
             if (supportTelephony) waitForAvailable(telephonyCb);
         } finally {
             // Restore the previous state of airplane mode and permissions: