debuggerd: always send SIGCONT after detaching.

Bug: http://b/27330889
Change-Id: I104248af1cde03dbdbacc03c87fe7e2dffd6c037
(cherry picked from commit 24464185eb)
This commit is contained in:
Josh Gao 2016-03-22 16:37:45 -07:00
parent 05e1e1fb41
commit a6219eae8d

View file

@ -586,9 +586,7 @@ static void monitor_worker_process(int child_pid, const debugger_request_t& requ
kill_worker = true;
kill_target = true;
kill_self = true;
}
if (WIFSIGNALED(status)) {
} else if (WIFSIGNALED(status)) {
ALOGE("debuggerd: worker process %d terminated due to signal %d", child_pid, WTERMSIG(status));
kill_worker = false;
kill_target = true;
@ -612,15 +610,16 @@ static void monitor_worker_process(int child_pid, const debugger_request_t& requ
}
}
if (kill_target) {
// Resume or kill the target, depending on what the initial request was.
if (request.action == DEBUGGER_ACTION_CRASH) {
ALOGE("debuggerd: killing target %d", request.pid);
kill(request.pid, SIGKILL);
} else {
ALOGE("debuggerd: resuming target %d", request.pid);
kill(request.pid, SIGCONT);
}
int exit_signal = SIGCONT;
if (kill_target && request.action == DEBUGGER_ACTION_CRASH) {
ALOGE("debuggerd: killing target %d", request.pid);
exit_signal = SIGKILL;
} else {
ALOGW("debuggerd: resuming target %d", request.pid);
}
if (kill(request.pid, exit_signal) != 0) {
ALOGE("debuggerd: failed to send signal %d to target: %s", exit_signal, strerror(errno));
}
if (kill_self) {