commit 881e47a9fe544a3f0248c0aaa765791cac13f98b
author Motomu Utsumi <motomuman@google.com> Wed Aug 07 18:39:09 2024 +0900
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Mon Aug 19 17:58:23 2024 +0000
tree 30ce5e2520dd81106efbb7e67411e12677c10d94
parent 0e8a1e4a5a118df278ea2e5dff5524a518972188

Use ensureCellularValidated which request cell

ensureValidatedNetwork does not request network.
So this fails if MOBILE_DATA_ALWAYS_ON is disabled and the cell network
is down

Bug: 356291552
Test: ConnectivityManagerTest
(cherry picked from https://android-review.googlesource.com/q/commit:5443938a4161a5d1174137bc642e1aa30619ed16)
Merged-In: I0e5f67467d6ef591028225ddb138d8ed5f4fa32a
Change-Id: I0e5f67467d6ef591028225ddb138d8ed5f4fa32a

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 21eb90f..3338712 100644
--- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -207,6 +207,7 @@
 import com.android.networkstack.apishim.common.ConnectivityManagerShim;
 import com.android.testutils.AutoReleaseNetworkCallbackRule;
 import com.android.testutils.CompatUtil;
+import com.android.testutils.ConnectUtil;
 import com.android.testutils.ConnectivityModuleTest;
 import com.android.testutils.DevSdkIgnoreRule;
 import com.android.testutils.DevSdkIgnoreRule.IgnoreAfter;
@@ -2941,20 +2942,10 @@
         // This may also apply to wifi in principle, but in practice methods that mock validation
         // URL all disconnect wifi forcefully anyway, so don't wait for wifi to validate.
         if (mPackageManager.hasSystemFeature(FEATURE_TELEPHONY)) {
-            ensureValidatedNetwork(makeCellNetworkRequest());
+            new ConnectUtil(mContext).ensureCellularValidated();
         }
     }
 
-    private void ensureValidatedNetwork(NetworkRequest request) {
-        final TestableNetworkCallback cb = new TestableNetworkCallback();
-        mCm.registerNetworkCallback(request, cb);
-        cb.eventuallyExpect(CallbackEntry.NETWORK_CAPS_UPDATED,
-                NETWORK_CALLBACK_TIMEOUT_MS,
-                entry -> ((CallbackEntry.CapabilitiesChanged) entry).getCaps()
-                        .hasCapability(NET_CAPABILITY_VALIDATED));
-        mCm.unregisterNetworkCallback(cb);
-    }
-
     @AppModeFull(reason = "WRITE_DEVICE_CONFIG permission can't be granted to instant apps")
     @Test
     public void testAcceptPartialConnectivity_validatedNetwork() throws Exception {