ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "debuggerd: restore the location of abort message."

Browse source
This commit is contained in:
Treehugger Robot 2017-12-23 00:17:34 +00:00 • committed by Gerrit Code Review
commit 2da01a2a71
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
debuggerd/libdebuggerd/tombstone.cpp
View file

@ -402,6 +402,10 @@ static bool dump_thread(log_t* log, BacktraceMap* map, Memory* process_memory,
dump_signal_info(log, thread_info.siginfo); 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()); dump_registers(log, thread_info.registers.get());
std::vector<backtrace_frame_data_t> frames; std::vector<backtrace_frame_data_t> frames;
@ -418,10 +422,6 @@ static bool dump_thread(log_t* log, BacktraceMap* map, Memory* process_memory,
dump_stack(log, map, process_memory, frames); dump_stack(log, map, process_memory, frames);
} }
if (primary_thread) {
dump_abort_message(log, process_memory, abort_msg_address);
}
if (primary_thread) { if (primary_thread) {
dump_memory_and_code(log, process_memory, thread_info.registers.get()); dump_memory_and_code(log, process_memory, thread_info.registers.get());
if (map) { if (map) {