From 1cf4f686a903cc397aaf45c2208225f28d865b26 Mon Sep 17 00:00:00 2001
From: chayemme <chaneswarareddy.yemme@amd.com>
Date: Mon, 29 Jul 2024 14:13:25 +0530
Subject: [PATCH] Skip WiFi test in CtsWifiTestCases  and CtsNetTestCases
 modules if feature not supported

Test cases testSoftApConfigurationGetPersistentRandomizedMacAddress and testSetAirplaneMode
are using the wifi service even wifi feature is disabled.
This change skips the test based on WiFi feature

Bug: 349198732
Change-Id: I1f1a9968dc716dbb2fbca42c1a9ca6271c474238
Merged-In: I3ba614e3b4e1b63973510d687459f822cb441bd7
---
 .../net/src/android/net/cts/ConnectivityManagerTest.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
index 0c3bb8992a..46e4f35feb 100644
--- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -2266,8 +2266,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);