Merge "Add test for NetworkCapabilities.Builder.withoutDefaultCapabilities" into sc-dev am: 7094b6470f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14674291

Change-Id: I71ea7c265e109f44286dd2aafeee2964f24f2ed2
This commit is contained in:
TreeHugger Robot
2021-05-22 05:02:45 +00:00
committed by Automerger Merge Worker

View File

@@ -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;
@@ -1155,4 +1156,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);
}
}