Only require wifi for tests that need it.

Bug: 262189427
Test: atest CtsJobSchedulerTestCases:ConnectivityConstraintTest
Test: atest CtsJobSchedulerTestCases:JobThrottlingTest
Change-Id: I0d7749f3739dffa694ff56fda101d2124edad85e
(cherry picked from commit 2ada3ed32c506affc405da042a49ebb3436ab69b)
Merged-In: I0d7749f3739dffa694ff56fda101d2124edad85e
(cherry picked from commit b70ca586e4b1929cb5681c49e1980f5c5aa92be2)

3 files changed, 22 insertions, 15 deletions

diff --git a/tests/JobScheduler/src/android/jobscheduler/cts/ConnectivityConstraintTest.java b/tests/JobScheduler/src/android/jobscheduler/cts/ConnectivityConstraintTest.java
index edb9949c934..02592195370 100644
--- a/tests/JobScheduler/src/android/jobscheduler/cts/ConnectivityConstraintTest.java
+++ b/tests/JobScheduler/src/android/jobscheduler/cts/ConnectivityConstraintTest.java
@@ -81,6 +81,9 @@ public class ConnectivityConstraintTest extends BaseJobSchedulerTest {
         mHasTelephony = packageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY);
         mBuilder = new JobInfo.Builder(CONNECTIVITY_JOB_ID, kJobServiceComponent);
 
+        if (mHasWifi) {
+            mNetworkingHelper.ensureSavedWifiNetwork();
+        }
         mInitialRestrictedBucketEnabled = Settings.Global.getString(mContext.getContentResolver(),
                 Settings.Global.ENABLE_RESTRICTED_BUCKET);
         setDataSaverEnabled(false);
diff --git a/tests/JobScheduler/src/android/jobscheduler/cts/JobThrottlingTest.java b/tests/JobScheduler/src/android/jobscheduler/cts/JobThrottlingTest.java
index 04c8048ec2f..6336a8d9160 100644
--- a/tests/JobScheduler/src/android/jobscheduler/cts/JobThrottlingTest.java
+++ b/tests/JobScheduler/src/android/jobscheduler/cts/JobThrottlingTest.java
@@ -606,6 +606,7 @@ public class JobThrottlingTest {
         assumeFalse("not testable in leanback device", mLeanbackOnly);
         assumeFalse("not testable, since ethernet is connected", hasEthernetConnection());
         assumeTrue(mNetworkingHelper.hasWifiFeature());
+        mNetworkingHelper.ensureSavedWifiNetwork();
 
         setRestrictedBucketEnabled(true);
 
@@ -948,6 +949,7 @@ public class JobThrottlingTest {
         assumeFalse("not testable in leanback device", mLeanbackOnly);
 
         assumeTrue(mNetworkingHelper.hasWifiFeature());
+        mNetworkingHelper.ensureSavedWifiNetwork();
 
         setRestrictedBucketEnabled(true);
         setTestPackageStandbyBucket(Bucket.RESTRICTED);
diff --git a/tests/JobScheduler/src/android/jobscheduler/cts/NetworkingHelper.java b/tests/JobScheduler/src/android/jobscheduler/cts/NetworkingHelper.java
index 23ae328bda4..fb5d90331dd 100644
--- a/tests/JobScheduler/src/android/jobscheduler/cts/NetworkingHelper.java
+++ b/tests/JobScheduler/src/android/jobscheduler/cts/NetworkingHelper.java
@@ -84,8 +84,8 @@ public class NetworkingHelper {
     private final boolean mInitialDataSaverState;
     private final String mInitialLocationMode;
     private final boolean mInitialWiFiState;
-    private final String mInitialWiFiMeteredState;
-    private final String mInitialWiFiSSID;
+    private String mInitialWiFiMeteredState;
+    private String mInitialWiFiSSID;
 
     NetworkingHelper(@NonNull Instrumentation instrumentation, @NonNull Context context)
             throws Exception {
@@ -103,25 +103,24 @@ public class NetworkingHelper {
         mInitialDataSaverState = isDataSaverEnabled();
         mInitialLocationMode = Settings.Secure.getString(
                 mContext.getContentResolver(), Settings.Secure.LOCATION_MODE);
-        if (mHasWifi) {
-            mInitialWiFiState = isWifiEnabled();
-            ensureSavedWifiNetwork();
-            setWifiState(true);
-            mInitialWiFiSSID = getWifiSSID();
-            mInitialWiFiMeteredState = getWifiMeteredStatus(mInitialWiFiSSID);
-        } else {
-            mInitialWiFiState = false;
-            mInitialWiFiSSID = null;
-            mInitialWiFiMeteredState = null;
-        }
+        mInitialWiFiState = mHasWifi && isWifiEnabled();
     }
 
     /** Ensures that the device has a wifi network saved. */
-    void ensureSavedWifiNetwork() {
+    void ensureSavedWifiNetwork() throws Exception {
+        if (!mHasWifi) {
+            return;
+        }
         final List<WifiConfiguration> savedNetworks =
                 ShellIdentityUtils.invokeMethodWithShellPermissions(
                         mWifiManager, WifiManager::getConfiguredNetworks);
         assertFalse("Need at least one saved wifi network", savedNetworks.isEmpty());
+
+        setWifiState(true);
+        if (mInitialWiFiSSID == null) {
+            mInitialWiFiSSID = getWifiSSID();
+            mInitialWiFiMeteredState = getWifiMeteredStatus(mInitialWiFiSSID);
+        }
     }
 
     // Returns "true", "false", or "none".
@@ -142,6 +141,7 @@ public class NetworkingHelper {
         return m.group(1);
     }
 
+    @NonNull
     private String getWifiSSID() throws Exception {
         // Location needs to be enabled to get the WiFi information.
         setLocationMode(String.valueOf(Settings.Secure.LOCATION_MODE_ON));
@@ -300,7 +300,9 @@ public class NetworkingHelper {
 
         // Ensure that we leave WiFi in its previous state.
         if (mHasWifi) {
-            setWifiMeteredState(mInitialWiFiSSID, mInitialWiFiMeteredState);
+            if (mInitialWiFiSSID != null) {
+                setWifiMeteredState(mInitialWiFiSSID, mInitialWiFiMeteredState);
+            }
             if (mWifiManager.isWifiEnabled() != mInitialWiFiState) {
                 try {
                     setWifiState(mInitialWiFiState);