From fac411d97c86b0533dd96cf5c6a88faec1e67760 Mon Sep 17 00:00:00 2001 From: Christopher Ferris Date: Thu, 27 Oct 2022 15:23:38 -0700 Subject: [PATCH] Remove unnecessary logging. Test: Extra logging no longers happens. Change-Id: Ia179ebe5d16e0bde7d6ec66e39d4484ff18f2b1e --- debuggerd/libdebuggerd/tombstone.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/debuggerd/libdebuggerd/tombstone.cpp b/debuggerd/libdebuggerd/tombstone.cpp index e5b4d74a1..375ed8a2c 100644 --- a/debuggerd/libdebuggerd/tombstone.cpp +++ b/debuggerd/libdebuggerd/tombstone.cpp @@ -77,9 +77,9 @@ void engrave_tombstone_ucontext(int tombstone_fd, int proto_fd, uint64_t abort_m .registers = std::move(regs), .uid = uid, .tid = target_tid, .thread_name = std::move(thread_name), .pid = pid, .command_line = std::move(command_line), .selinux_label = std::move(selinux_label), .siginfo = siginfo, -#if defined(__aarch64__) // Only supported on aarch64 for now. - .tagged_addr_ctrl = prctl(PR_GET_TAGGED_ADDR_CTRL, 0, 0, 0, 0), +#if defined(__aarch64__) + .tagged_addr_ctrl = prctl(PR_GET_TAGGED_ADDR_CTRL, 0, 0, 0, 0), .pac_enabled_keys = prctl(PR_PAC_GET_ENABLED_KEYS, 0, 0, 0, 0), #endif }; @@ -88,7 +88,6 @@ void engrave_tombstone_ucontext(int tombstone_fd, int proto_fd, uint64_t abort_m if (target_tid == tid) { return; } - async_safe_format_log(ANDROID_LOG_ERROR, LOG_TAG, "Adding thread %d", tid); threads[tid] = ThreadInfo{ .uid = thread.uid, .tid = tid,