Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34c2556d authored by Josh Gao's avatar Josh Gao
Browse files

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
parent 7302097e

debuggerd/libdebuggerd/tombstone.cpp

+4 −4
Original line number Diff line number Diff line
@@ -402,6 +402,10 @@ static bool dump_thread(log_t* log, BacktraceMap* map, Memory* process_memory, 
    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;
@@ -418,10 +422,6 @@ static bool dump_thread(log_t* log, BacktraceMap* map, Memory* process_memory, 
    dump_stack(log, map, process_memory, frames);

  }



  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) {