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
diff --git a/debuggerd/libdebuggerd/tombstone.cpp b/debuggerd/libdebuggerd/tombstone.cpp
index 624637a..89a125b 100644
--- a/debuggerd/libdebuggerd/tombstone.cpp
+++ b/debuggerd/libdebuggerd/tombstone.cpp
@@ -402,6 +402,10 @@
dump_signal_info(log, thread_info.siginfo);
}
+ if (primary_thread) {
+ dump_abort_message(log, process_memory, abort_msg_address);
+ }
+
dump_registers(log, thread_info.registers.get());
std::vector<backtrace_frame_data_t> frames;
@@ -419,10 +423,6 @@
}
if (primary_thread) {
- dump_abort_message(log, process_memory, abort_msg_address);
- }
-
- if (primary_thread) {
dump_memory_and_code(log, process_memory, thread_info.registers.get());
if (map) {
uintptr_t addr = 0;