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

This commit is contained in:
Treehugger Robot 2025-01-30 05:56:27 -08:00 • committed by Gerrit Code Review
commit 56d6ad9764

View file

@ -2331,8 +2331,10 @@ public class ConnectivityManagerTest {
// 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);