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

Merge "Fixing comments in Network Capabilities" am: b6477d22ca

Browse Source 
am: 2c36870f3d

Change-Id: If3c0d76f9598d931d801271c4d0634e15f4b9ed4
This commit is contained in:
Pavel Maltsev
2018-03-12 08:08:31 +00:00
committed by android-build-merger
parent 69dcff707c 2c36870f3d
commit 3152f214df
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/net/java/android/net/NetworkCapabilitiesTest.java
View File

@@ -282,7 +282,7 @@ public class NetworkCapabilitiesTest {
assertTrue("Request: " + request + ", Network:" + network,
request.satisfiedByNetworkCapabilities(network));
// Adding capabilities that doesn't exist in the network anyway
// Requesting absence of capabilities that network doesn't have. Request should satisfy.
request.addUnwantedCapability(NET_CAPABILITY_WIFI_P2P);
request.addUnwantedCapability(NET_CAPABILITY_NOT_METERED);
assertTrue(request.satisfiedByNetworkCapabilities(network));
@@ -297,7 +297,6 @@ public class NetworkCapabilitiesTest {
assertTrue(request.hasUnwantedCapability(NET_CAPABILITY_NOT_RESTRICTED));
assertFalse(request.hasCapability(NET_CAPABILITY_NOT_RESTRICTED));
// Now this request won't be satisfied because network contains NOT_RESTRICTED.
assertFalse(request.satisfiedByNetworkCapabilities(network));
network.removeCapability(NET_CAPABILITY_NOT_RESTRICTED);