joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Use ensureCellularValidated which request cell" into main

Browse source
This commit is contained in:
Treehugger Robot 2024-08-09 04:45:30 +00:00 • committed by Gerrit Code Review
commit 2fc3231b5c
1 changed files with 2 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
View file

@ -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 {