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

Merge "Update language to comply with Android's inclusive language guidance" am: 577c469d6b am: 156ea0167e am: a3b25d71a9 am: eb75886334

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/cts/+/1373261

Change-Id: If6d13d7736b3d8bb6e87a8e850bf8328a25e73af
This commit is contained in:
Chiachang Wang
2020-07-29 06:52:06 +00:00
committed by Automerger Merge Worker
parent 989074073c eb75886334
commit 3f85417ace
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
View File

@@ -352,8 +352,8 @@ public class ConnectivityManagerTest {
wifiAddressString, wifiNetwork, cellNetwork), wifiAddressString, wifiNetwork, cellNetwork),
wifiAddressString.equals(cellAddressString)); wifiAddressString.equals(cellAddressString));
// Sanity check that the IP addresses that the requests appeared to come from // Verify that the IP addresses that the requests appeared to come from are actually on the
// are actually on the respective networks. // respective networks.
assertOnNetwork(wifiAddressString, wifiNetwork); assertOnNetwork(wifiAddressString, wifiNetwork);
assertOnNetwork(cellAddressString, cellNetwork); assertOnNetwork(cellAddressString, cellNetwork);
@@ -709,7 +709,7 @@ public class ConnectivityManagerTest {
private void assertMultipathPreferenceIsEventually(Network network, int oldValue, private void assertMultipathPreferenceIsEventually(Network network, int oldValue,
int expectedValue) { int expectedValue) {
// Sanity check : if oldValue == expectedValue, there is no way to guarantee the test // Quick check : if oldValue == expectedValue, there is no way to guarantee the test
// is not flaky. // is not flaky.
assertNotSame(oldValue, expectedValue); assertNotSame(oldValue, expectedValue);
@@ -1013,7 +1013,7 @@ public class ConnectivityManagerTest {
// NAT-T keepalive. If keepalive limits from resource overlay is not zero, TCP keepalive // NAT-T keepalive. If keepalive limits from resource overlay is not zero, TCP keepalive
// needs to be supported except if the kernel doesn't support it. // needs to be supported except if the kernel doesn't support it.
if (!isTcpKeepaliveSupportedByKernel()) { if (!isTcpKeepaliveSupportedByKernel()) {
// Sanity check to ensure the callback result is expected. // Verify that the callback result is expected.
runWithShellPermissionIdentity(() -> { runWithShellPermissionIdentity(() -> {
assertEquals(0, createConcurrentSocketKeepalives(network, srcAddr, 0, 1)); assertEquals(0, createConcurrentSocketKeepalives(network, srcAddr, 0, 1));
}); });