summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Gao2017-12-22 16:18:39 -0600
committerJosh Gao2017-12-22 16:20:12 -0600
commit34c2556d11f860c4a7f46cecada69ba4b4ff71b4 (patch)
tree709e09198abef7cebbbcab822a2e43b0deb63af9 /debuggerd
parent7302097e776e037c5caedbc985dfff69fdac7d4d (diff)
downloadplatform-system-core-34c2556d11f860c4a7f46cecada69ba4b4ff71b4.tar.gz
platform-system-core-34c2556d11f860c4a7f46cecada69ba4b4ff71b4.tar.xz
platform-system-core-34c2556d11f860c4a7f46cecada69ba4b4ff71b4.zip
debuggerd: restore the location of abort message.
The abort message was accidentally relocated to be printed below the registers, backtrace, and stack, which isn't very helpful. Move it back to its rightful place. Test: treehugger Change-Id: I8aa5b63e58081f27ccdb42481fed8d9eb3a892a4
Diffstat (limited to 'debuggerd')
-rw-r--r--debuggerd/libdebuggerd/tombstone.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/debuggerd/libdebuggerd/tombstone.cpp b/debuggerd/libdebuggerd/tombstone.cpp
index 624637a88..89a125b80 100644
--- a/debuggerd/libdebuggerd/tombstone.cpp
+++ b/debuggerd/libdebuggerd/tombstone.cpp
@@ -402,6 +402,10 @@ static bool dump_thread(log_t* log, BacktraceMap* map, Memory* process_memory,
402 dump_signal_info(log, thread_info.siginfo); 402 dump_signal_info(log, thread_info.siginfo);
403 } 403 }
404 404
405 if (primary_thread) {
406 dump_abort_message(log, process_memory, abort_msg_address);
407 }
408
405 dump_registers(log, thread_info.registers.get()); 409 dump_registers(log, thread_info.registers.get());
406 410
407 std::vector<backtrace_frame_data_t> frames; 411 std::vector<backtrace_frame_data_t> frames;
@@ -419,10 +423,6 @@ static bool dump_thread(log_t* log, BacktraceMap* map, Memory* process_memory,
419 } 423 }
420 424
421 if (primary_thread) { 425 if (primary_thread) {
422 dump_abort_message(log, process_memory, abort_msg_address);
423 }
424
425 if (primary_thread) {
426 dump_memory_and_code(log, process_memory, thread_info.registers.get()); 426 dump_memory_and_code(log, process_memory, thread_info.registers.get());
427 if (map) { 427 if (map) {
428 uintptr_t addr = 0; 428 uintptr_t addr = 0;