Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b216377 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

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
parent fcaed0ef

adb/adb_utils.h

+1 −1
Original line number Diff line number Diff line
@@ -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.

adb/fdevent/fdevent_test.h

+2 −2
Original line number Diff line number Diff line
@@ -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;

    }

adb/sockets.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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));

bootstat/boot_reason_test.sh

+1 −1
Original line number Diff line number Diff line
@@ -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=`(

debuggerd/libdebuggerd/tombstone.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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.")) {