Merge "Add test for NetworkCapabilities.Builder.withoutDefaultCapabilities" am: 32bd81d88b am: 38b86a2c15 am: ca34df0a6a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1712731 Change-Id: Ib3005e70fd2f70a9ba591157c9ac9edd4642ddae
This commit is contained in:
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user