commit 53f2d829510927129c57e7a8dfa908a46ba0ab55
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jan 31 03:58:09 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 31 03:58:10 2017 +0000
tree 2189dde7b2b2ee256e56886edbba62798f11befa
parent 698035b8fe0458fe53c397bbe8cb7d1908e85184
parent 1e4afb52c58c3d960160bfe1f7442618aeeec1ce

Merge changes Ibd7bbddb,I2f571009

* changes:
  debuggerd: fix `debuggerd <pid>`
  debuggerd: fix `debuggerd -b <pid>`

debuggerd/crash_dump.cpp

diff --git a/debuggerd/crash_dump.cpp b/debuggerd/crash_dump.cpp
index c145933..58eaed7 100644
--- a/debuggerd/crash_dump.cpp
+++ b/debuggerd/crash_dump.cpp
@@ -322,7 +322,7 @@
   bool fatal_signal = signo != DEBUGGER_SIGNAL;
   std::set<pid_t> siblings;
   std::set<pid_t> attached_siblings;
-  if (fatal_signal) {
+  if (fatal_signal || backtrace) {
     if (!android::procinfo::GetProcessTids(target, &siblings)) {
       PLOG(FATAL) << "failed to get process siblings";
     }

debuggerd/debuggerd.cpp

diff --git a/debuggerd/debuggerd.cpp b/debuggerd/debuggerd.cpp
index 3208230..0c5d3cf 100644
--- a/debuggerd/debuggerd.cpp
+++ b/debuggerd/debuggerd.cpp
@@ -71,7 +71,7 @@
   std::thread redirect_thread = spawn_redirect_thread(std::move(piperead));
   bool backtrace = argc == 3;
   if (!debuggerd_trigger_dump(pid, std::move(pipewrite),
-                              backtrace ? kDebuggerdBacktrace : kDebuggerdBacktrace, 0)) {
+                              backtrace ? kDebuggerdBacktrace : kDebuggerdTombstone, 0)) {
     redirect_thread.join();
     errx(1, "failed to dump process %d", pid);
   }