Merge changes Ibd7bbddb,I2f571009

* changes:
  debuggerd: fix `debuggerd <pid>`
  debuggerd: fix `debuggerd -b <pid>`
This commit is contained in:
Treehugger Robot 2017-01-31 03:58:09 +00:00 committed by Gerrit Code Review
commit 53f2d82951
2 changed files with 2 additions and 2 deletions

View file

@ -322,7 +322,7 @@ int main(int argc, char** argv) {
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";
}

View file

@ -71,7 +71,7 @@ int main(int argc, char* argv[]) {
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);
}