Merge cherrypicks of [15347097, 15347098] into sparse-7550996-L60300000950383421 (fdf13651) · Commits · e / os / android_packages_modules_NetworkStack

tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java

+6 −4

Original line number	Diff line number	Diff line
		@@ -1813,26 +1813,28 @@ public class NetworkMonitorTest {

		@Test
		public void testNoTrustedCapabilityValidated() throws Exception {
		final NetworkCapabilities.Builder nc = new NetworkCapabilities.Builder()
		// Cannot use the NetworkCapabilities builder on Q
		final NetworkCapabilities nc = new NetworkCapabilities()
		.addCapability(NET_CAPABILITY_INTERNET)
		.removeCapability(NET_CAPABILITY_TRUSTED)
		.addTransportType(TRANSPORT_CELLULAR);
		if (ShimUtils.isAtLeastS()) {
		nc.addCapability(NET_CAPABILITY_NOT_VCN_MANAGED);
		}
		doValidationSkippedTest(nc.build());
		doValidationSkippedTest(nc);
		}

		@Test
		public void testRestrictedCapabilityValidated() throws Exception {
		final NetworkCapabilities.Builder nc = new NetworkCapabilities.Builder()
		// Cannot use the NetworkCapabilities builder on Q
		final NetworkCapabilities nc = new NetworkCapabilities()
		.addCapability(NET_CAPABILITY_INTERNET)
		.removeCapability(NET_CAPABILITY_NOT_RESTRICTED)
		.addTransportType(TRANSPORT_CELLULAR);
		if (ShimUtils.isAtLeastS()) {
		nc.addCapability(NET_CAPABILITY_NOT_VCN_MANAGED);
		}
		doValidationSkippedTest(nc.build());
		doValidationSkippedTest(nc);
		}

		private NetworkCapabilities getVcnUnderlyingCarrierWifiCaps() {