Merge "libdebuggerd: do a to-do." am: 5c2c72b44b am: c9ca928f3f am: 3d8a7e789e am: df2c9ffdc9

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

Change-Id: I961e8f521afab5d7f2d8ba0cfe6896e4cb1f306f
This commit is contained in:
Elliott Hughes 2020-08-03 20:59:39 +00:00 committed by Automerger Merge Worker
commit 8690f93129

View file

@ -174,12 +174,8 @@ static void dump_signal_info(log_t* log, const ThreadInfo& thread_info,
}
static void dump_thread_info(log_t* log, const ThreadInfo& thread_info) {
// 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.")) {
log->should_retrieve_logcat = false;
}
// Don't try to collect logs from the threads that implement the logging system itself.
if (thread_info.uid == AID_LOGD) log->should_retrieve_logcat = false;
_LOG(log, logtype::HEADER, "pid: %d, tid: %d, name: %s >>> %s <<<\n", thread_info.pid,
thread_info.tid, thread_info.thread_name.c_str(), thread_info.process_name.c_str());