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

Merge "Fix NetworkCapabilitiesTest fail on Q device" into rvc-dev

Browse Source
This commit is contained in:
Lucas Lin
2020-03-25 02:00:35 +00:00
committed by Android (Google) Code Review
parent cbd7b6b1dd 88cef1a242
commit 1aff262943
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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