Merge "Update language to comply with Android's inclusive language guidance" am: f702025bdf am: ef723b7617

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373160 Change-Id: I9318abb0233e7b8847466914724eeaae769ea9c8
2020-07-28 11:19:47 +00:00
parent 8f98e732a0 ef723b7617
commit 6d70190fcd
3 changed files with 8 additions and 8 deletions
--- a/tests/net/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java
@@ -4226,7 +4226,7 @@ public class ConnectivityServiceTest {
            callback.expectError(SocketKeepalive.ERROR_INVALID_IP_ADDRESS);
        }

-        // Sanity check before testing started keepalive.
+        // Basic check before testing started keepalive.
        try (SocketKeepalive ka = mCm.createSocketKeepalive(
                myNet, testSocket, myIPv4, dstIPv4, executor, callback)) {
            ka.start(validKaInterval);