commit 56d6ad976425c6762e90de1c60e62992ae1b6d8a
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Jan 30 05:56:27 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 30 05:56:27 2025 -0800
tree 16dc11b4bb64d5c102683b09525b56ee95c2ba4d
parent 3e0f6b37a23b823aa70762963f5e4831d605bbe1
parent eeed24cd544ab205988a26dcc1a21d479945833b

Merge "Skip WiFi test in CtsWifiTestCases  and CtsNetTestCases modules if feature not supported" into main

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 7f03a02..00c87a3 100644
--- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -2331,8 +2331,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) {
                 telephonyCb.eventuallyExpect(
                         CallbackEntry.AVAILABLE, CELL_DATA_AVAILABLE_TIMEOUT_MS);