commit f45cc4f259a92725cf455c5956188d157c44a4ba
author Remi NGUYEN VAN <reminv@google.com> Thu Jul 15 09:29:03 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 15 09:29:03 2021 +0000
tree 1a3832fff81596ec38283518dc261a03aa32d257
parent 03563d0bf9def708fbcd8193a2761ee3f574376b
parent 130f670688278ee0216a87c1f2c218c6771297dd

Fix NetworkMonitorTest on Q am: 38b1a384a9 am: 130f670688

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1767388

Change-Id: I096a50b073cbb8b54695af55482a03e368666967

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

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() {