LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Add test for NetworkCapabilities.Builder.withoutDefaultCapabilities" am: 32bd81d88b

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1712731

Change-Id: I6a5f4681224315c2c63cad24e0defd1abcc25330
This commit is contained in:
Chiachang Wang
2021-05-21 03:56:22 +00:00
committed by Automerger Merge Worker
parent ab42076b53 32bd81d88b
commit 38b86a2c15
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/common/java/android/net/NetworkCapabilitiesTest.java
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_PAID;
import static android.net.NetworkCapabilities.NET_CAPABILITY_OEM_PRIVATE; 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_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_VALIDATED;
import static android.net.NetworkCapabilities.NET_CAPABILITY_WIFI_P2P; import static android.net.NetworkCapabilities.NET_CAPABILITY_WIFI_P2P;
import static android.net.NetworkCapabilities.REDACT_FOR_ACCESS_FINE_LOCATION; import static android.net.NetworkCapabilities.REDACT_FOR_ACCESS_FINE_LOCATION;
@@ -1149,4 +1150,15 @@ public class NetworkCapabilitiesTest {
assertEquals(Set.of(TEST_SUBID1), nc2.getSubscriptionIds()); 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);
}
} }