ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Update language to comply with Android's inclusive language guidance" am: 9d7657b62e

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1382610

Change-Id: I0674880834a94a4987eeedc7e7fe53e5c1bbe72e
This commit is contained in:
Elliott Hughes 2020-08-03 15:51:47 +00:00 • committed by Automerger Merge Worker
commit 78e66dbf7d
9 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
adb/adb_utils.h
View file

@ -55,7 +55,7 @@ std::string perror_str(const char* msg);
bool set_file_block_mode(borrowed_fd fd, bool block); 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. // |error| and returns false.
// Currently this only checks "tcp:" targets. Additional checking could be added for other targets // Currently this only checks "tcp:" targets. Additional checking could be added for other targets
// if needed. // if needed.

4
adb/fdevent/fdevent_test.h
View file

@ -65,7 +65,7 @@ class FdeventTest : public ::testing::Test {
ASSERT_EQ(0u, fdevent_installed_count()); 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() { void PrepareThread() {
int dummy_fds[2]; int dummy_fds[2];
if (adb_socketpair(dummy_fds) != 0) { if (adb_socketpair(dummy_fds) != 0) {
@ -84,7 +84,7 @@ class FdeventTest : public ::testing::Test {
} }
size_t GetAdditionalLocalSocketCount() { size_t GetAdditionalLocalSocketCount() {
// dummy socket installed in PrepareThread() // placeholder socket installed in PrepareThread()
return 1; return 1;
} }

2
adb/sockets.cpp
View file

@ -856,7 +856,7 @@ static int smart_socket_enqueue(asocket* s, apacket::payload_type data) {
s->peer->shutdown = nullptr; s->peer->shutdown = nullptr;
s->peer->close = local_socket_close_notify; s->peer->close = local_socket_close_notify;
s->peer->peer = nullptr; s->peer->peer = nullptr;
/* give him our transport and upref it */ /* give them our transport and upref it */
s->peer->transport = s->transport; s->peer->transport = s->transport;
connect_to_remote(s->peer, std::string_view(s->smart_socket_data).substr(4)); connect_to_remote(s->peer, std::string_view(s->smart_socket_data).substr(4));

2
bootstat/boot_reason_test.sh
View file

@ -1331,7 +1331,7 @@ if [ X"--macros" != X"${1}" ]; then
shift shift
fi fi
# Check if all conditions for the script are sane # Check if all conditions for the script are valid
if [ -z "${ANDROID_SERIAL}" ]; then if [ -z "${ANDROID_SERIAL}" ]; then
ndev=`( ndev=`(

2
debuggerd/libdebuggerd/tombstone.cpp
View file

@ -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) { 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? // TODO: Why is this controlled by thread name?
if (thread_info.thread_name == "logd" || if (thread_info.thread_name == "logd" ||
android::base::StartsWith(thread_info.thread_name, "logd.")) { android::base::StartsWith(thread_info.thread_name, "logd.")) {

1
debuggerd/libdebuggerd/utility.cpp
View file

@ -44,7 +44,6 @@
using android::base::unique_fd; using android::base::unique_fd;
// Whitelist output desired in the logcat output.
bool is_allowed_in_logcat(enum logtype ltype) { bool is_allowed_in_logcat(enum logtype ltype) {
if ((ltype == HEADER) if ((ltype == HEADER)
|| (ltype == REGISTERS) || (ltype == REGISTERS)

2
libcutils/include/private/android_filesystem_config.h
View file

@ -36,7 +36,7 @@
#pragma once #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 * DO NOT EVER RENUMBER
*/ */

2
libkeyutils/keyutils_test.cpp
View file

@ -33,7 +33,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
TEST(keyutils, smoke) { 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)); ASSERT_EQ(4U, sizeof(key_serial_t));
// Check that all the functions actually exist. // Check that all the functions actually exist.

2
trusty/confirmationui/NotSoSecureInput.cpp
View file

@ -82,7 +82,7 @@ Nonce generateNonce() {
/** /**
* This is an implementation of the SecureInput protocol in unserspace. This is * 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 * 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 * 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 * that links directly against this implementation is not secure and shal not be