From 5443938a4161a5d1174137bc642e1aa30619ed16 Mon Sep 17 00:00:00 2001 From: Motomu Utsumi Date: Wed, 7 Aug 2024 18:39:09 +0900 Subject: [PATCH] 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 Change-Id: I0e5f67467d6ef591028225ddb138d8ed5f4fa32a --- .../android/net/cts/ConnectivityManagerTest.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java index 94584607c7..88c2d5ad2b 100644 --- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java +++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java @@ -206,6 +206,7 @@ import com.android.networkstack.apishim.NetworkInformationShimImpl; 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; @@ -2942,20 +2943,10 @@ public class ConnectivityManagerTest { // 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 {