commit 31b86596069e286cb2a7588d0136e9d20a615f9d
author Josh Gao <jmgao@google.com> Sat Dec 23 00:23:14 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Dec 23 00:23:14 2017 +0000
tree 709e09198abef7cebbbcab822a2e43b0deb63af9
parent 65e2c06a9063b5c22edbc4ba6ead8057c97e8aaf
parent 2da01a2a71f8d0e1c51bd82630f540c5c54c12b0

Merge "debuggerd: restore the location of abort message."
am: 2da01a2a71

Change-Id: Idb373a5e1b7e9772269bb184cb2b32c4e6a9a776

debuggerd/libdebuggerd/tombstone.cpp

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;