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

Commit ad90832f authored by Josh Gao's avatar Josh Gao Committed by android-build-merger
Browse files

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

am: 31b86596

Change-Id: I7b73593cd469f246cb6f197f1d69d274927ff15a
parents 6c9ea516 31b86596

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