Fix NetworkMonitorTest on Q
NetworkCapabilities.Builder does not exist on Q, so use the setters
instead.
Bug: 193063817
Test: atest NetworkMonitorTest
Change-Id: I539266de29fa84ba02590ced796de9a6ab012aca
diff --git a/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java b/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java
index 66d1c71..606d243 100644
--- a/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java
+++ b/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java
@@ -1813,26 +1813,28 @@
@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() {