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

Merge "Create a builder for NetworkCapabilities." into rvc-dev

Browse Source
This commit is contained in:
Junyu Lai
2020-03-20 11:03:47 +00:00
committed by Android (Google) Code Review
parent ad76cd9864 d7d24015a5
commit 7049aa6816
4 changed files with 377 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/net/common/java/android/net/NetworkCapabilitiesTest.java
View File

@@ -463,7 +463,7 @@ public class NetworkCapabilitiesTest {
nc1.setSSID(TEST_SSID);
nc2.combineCapabilities(nc1);
assertTrue(TEST_SSID.equals(nc2.getSSID()));
assertTrue(TEST_SSID.equals(nc2.getSsid()));
// Because they now have the same SSID, the following call should not throw
nc2.combineCapabilities(nc1);
@@ -601,12 +601,12 @@ public class NetworkCapabilitiesTest {
// from nc2.
assertFalse(nc2.hasCapability(NET_CAPABILITY_NOT_ROAMING));
assertTrue(nc2.hasUnwantedCapability(NET_CAPABILITY_NOT_ROAMING));
assertTrue(TEST_SSID.equals(nc2.getSSID()));
assertTrue(TEST_SSID.equals(nc2.getSsid()));
nc1.setSSID(DIFFERENT_TEST_SSID);
nc2.set(nc1);
assertEquals(nc1, nc2);
assertTrue(DIFFERENT_TEST_SSID.equals(nc2.getSSID()));
assertTrue(DIFFERENT_TEST_SSID.equals(nc2.getSsid()));
nc1.setUids(uidRange(10, 13));
nc2.set(nc1); // Overwrites, as opposed to combineCapabilities