summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChiachang Wang <chiachangwang@google.com>2021-05-21 03:33:23 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-05-21 03:33:23 +0000
commit392633f7576803b4e6d38695b6975faec71d39d9 (patch)
treeb2fa4539698616983c94ddaa43c321055223a4e9
parent327678ebd635ac49dd84a0ccc1898cb15c7ab14f (diff)
parentd9168914051d0589d37efe3c9a8102f9022fd949 (diff)
downloadbase-392633f7576803b4e6d38695b6975faec71d39d9.tar.gz
Merge "Add test for NetworkCapabilities.Builder.withoutDefaultCapabilities"
-rw-r--r--packages/Connectivity/tests/common/java/android/net/NetworkCapabilitiesTest.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/packages/Connectivity/tests/common/java/android/net/NetworkCapabilitiesTest.java b/packages/Connectivity/tests/common/java/android/net/NetworkCapabilitiesTest.java
index d74b802c8729..a30d4f11863e 100644
--- a/packages/Connectivity/tests/common/java/android/net/NetworkCapabilitiesTest.java
+++ b/packages/Connectivity/tests/common/java/android/net/NetworkCapabilitiesTest.java
@@ -33,6 +33,7 @@ import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_VPN;
import static android.net.NetworkCapabilities.NET_CAPABILITY_OEM_PAID;
import static android.net.NetworkCapabilities.NET_CAPABILITY_OEM_PRIVATE;
import static android.net.NetworkCapabilities.NET_CAPABILITY_PARTIAL_CONNECTIVITY;
+import static android.net.NetworkCapabilities.NET_CAPABILITY_TRUSTED;
import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED;
import static android.net.NetworkCapabilities.NET_CAPABILITY_WIFI_P2P;
import static android.net.NetworkCapabilities.REDACT_FOR_ACCESS_FINE_LOCATION;
@@ -1149,4 +1150,15 @@ public class NetworkCapabilitiesTest {
assertEquals(Set.of(TEST_SUBID1), nc2.getSubscriptionIds());
}
}
+
+ @Test @IgnoreUpTo(Build.VERSION_CODES.R)
+ public void testBuilderWithoutDefaultCap() {
+ final NetworkCapabilities nc =
+ NetworkCapabilities.Builder.withoutDefaultCapabilities().build();
+ assertFalse(nc.hasCapability(NET_CAPABILITY_NOT_RESTRICTED));
+ assertFalse(nc.hasCapability(NET_CAPABILITY_TRUSTED));
+ assertFalse(nc.hasCapability(NET_CAPABILITY_NOT_VPN));
+ // Ensure test case fails if new net cap is added into default cap but no update here.
+ assertEquals(0, nc.getCapabilities().length);
+ }
}