From 7b21637782358142be6953af26515b6cba80334b Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Fri, 31 Jul 2020 15:25:43 -0600 Subject: [PATCH] Update language to comply with Android's inclusive language guidance See https://source.android.com/setup/contribute/respectful-code for reference Bug: 161896447 Change-Id: Iafcccbdbdf3ff1078e87000e2ce560ff09b43f68 --- adb/adb_utils.h | 2 +- adb/fdevent/fdevent_test.h | 4 ++-- adb/sockets.cpp | 2 +- bootstat/boot_reason_test.sh | 2 +- debuggerd/libdebuggerd/tombstone.cpp | 2 +- debuggerd/libdebuggerd/utility.cpp | 1 - libcutils/include/private/android_filesystem_config.h | 2 +- libkeyutils/keyutils_test.cpp | 2 +- trusty/confirmationui/NotSoSecureInput.cpp | 2 +- 9 files changed, 9 insertions(+), 10 deletions(-) diff --git a/adb/adb_utils.h b/adb/adb_utils.h index 66cba121b..e72d8b6f8 100644 --- a/adb/adb_utils.h +++ b/adb/adb_utils.h @@ -55,7 +55,7 @@ std::string perror_str(const char* msg); bool set_file_block_mode(borrowed_fd fd, bool block); -// Given forward/reverse targets, returns true if they look sane. If an error is found, fills +// Given forward/reverse targets, returns true if they look valid. If an error is found, fills // |error| and returns false. // Currently this only checks "tcp:" targets. Additional checking could be added for other targets // if needed. diff --git a/adb/fdevent/fdevent_test.h b/adb/fdevent/fdevent_test.h index ecda4da97..fcbf181dc 100644 --- a/adb/fdevent/fdevent_test.h +++ b/adb/fdevent/fdevent_test.h @@ -65,7 +65,7 @@ class FdeventTest : public ::testing::Test { ASSERT_EQ(0u, fdevent_installed_count()); } - // Register a dummy socket used to wake up the fdevent loop to tell it to die. + // Register a placeholder socket used to wake up the fdevent loop to tell it to die. void PrepareThread() { int dummy_fds[2]; if (adb_socketpair(dummy_fds) != 0) { @@ -84,7 +84,7 @@ class FdeventTest : public ::testing::Test { } size_t GetAdditionalLocalSocketCount() { - // dummy socket installed in PrepareThread() + // placeholder socket installed in PrepareThread() return 1; } diff --git a/adb/sockets.cpp b/adb/sockets.cpp index 13a473776..33b952418 100644 --- a/adb/sockets.cpp +++ b/adb/sockets.cpp @@ -856,7 +856,7 @@ static int smart_socket_enqueue(asocket* s, apacket::payload_type data) { s->peer->shutdown = nullptr; s->peer->close = local_socket_close_notify; s->peer->peer = nullptr; - /* give him our transport and upref it */ + /* give them our transport and upref it */ s->peer->transport = s->transport; connect_to_remote(s->peer, std::string_view(s->smart_socket_data).substr(4)); diff --git a/bootstat/boot_reason_test.sh b/bootstat/boot_reason_test.sh index 2f2919f2a..7cff7dc9f 100755 --- a/bootstat/boot_reason_test.sh +++ b/bootstat/boot_reason_test.sh @@ -1331,7 +1331,7 @@ if [ X"--macros" != X"${1}" ]; then shift fi - # Check if all conditions for the script are sane + # Check if all conditions for the script are valid if [ -z "${ANDROID_SERIAL}" ]; then ndev=`( diff --git a/debuggerd/libdebuggerd/tombstone.cpp b/debuggerd/libdebuggerd/tombstone.cpp index face02bd7..2a1ca110b 100644 --- a/debuggerd/libdebuggerd/tombstone.cpp +++ b/debuggerd/libdebuggerd/tombstone.cpp @@ -174,7 +174,7 @@ static void dump_signal_info(log_t* log, const ThreadInfo& thread_info, } static void dump_thread_info(log_t* log, const ThreadInfo& thread_info) { - // Blacklist logd, logd.reader, logd.writer, logd.auditd, logd.control ... + // Deny logd, logd.reader, logd.writer, logd.auditd, logd.control ... // TODO: Why is this controlled by thread name? if (thread_info.thread_name == "logd" || android::base::StartsWith(thread_info.thread_name, "logd.")) { diff --git a/debuggerd/libdebuggerd/utility.cpp b/debuggerd/libdebuggerd/utility.cpp index f43092c21..4e6df09c9 100644 --- a/debuggerd/libdebuggerd/utility.cpp +++ b/debuggerd/libdebuggerd/utility.cpp @@ -44,7 +44,6 @@ using android::base::unique_fd; -// Whitelist output desired in the logcat output. bool is_allowed_in_logcat(enum logtype ltype) { if ((ltype == HEADER) || (ltype == REGISTERS) diff --git a/libcutils/include/private/android_filesystem_config.h b/libcutils/include/private/android_filesystem_config.h index e4f45a85e..b4fe2e687 100644 --- a/libcutils/include/private/android_filesystem_config.h +++ b/libcutils/include/private/android_filesystem_config.h @@ -36,7 +36,7 @@ #pragma once -/* This is the master Users and Groups config for the platform. +/* This is the main Users and Groups config for the platform. * DO NOT EVER RENUMBER */ diff --git a/libkeyutils/keyutils_test.cpp b/libkeyutils/keyutils_test.cpp index d41c91b68..d03747b3e 100644 --- a/libkeyutils/keyutils_test.cpp +++ b/libkeyutils/keyutils_test.cpp @@ -33,7 +33,7 @@ #include TEST(keyutils, smoke) { - // Check that the exported type is sane. + // Check that the exported type is the right size. ASSERT_EQ(4U, sizeof(key_serial_t)); // Check that all the functions actually exist. diff --git a/trusty/confirmationui/NotSoSecureInput.cpp b/trusty/confirmationui/NotSoSecureInput.cpp index 3d9a2d6e5..18e45cd35 100644 --- a/trusty/confirmationui/NotSoSecureInput.cpp +++ b/trusty/confirmationui/NotSoSecureInput.cpp @@ -82,7 +82,7 @@ Nonce generateNonce() { /** * This is an implementation of the SecureInput protocol in unserspace. This is - * just an example and should not be used as is. The protocol implemented her + * just an example and should not be used as is. The protocol implemented here * should be used by a trusted input device that can assert user events with * high assurance even if the HLOS kernel is compromised. A confirmationui HAL * that links directly against this implementation is not secure and shal not be