From 12dde9832585a16ad9633d948ebfd469b6f355e6 Mon Sep 17 00:00:00 2001
From: chayemme <chaneswarareddy.yemme@amd.com>
Date: Tue, 25 Jun 2024 13:22:06 +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
Test: atest CtsNetTestCases
Change-Id: I1ed6bd9522fac0151c5ac3b20d1b002bab79dd12
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 5d6615b47f..ff7cb48695 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 @@ 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) waitForAvailable(telephonyCb);
         } finally {
             // Restore the previous state of airplane mode and permissions: