diff options
| author | 2022-07-08 18:50:41 +0000 | |
|---|---|---|
| committer | 2022-07-08 18:50:41 +0000 | |
| commit | 7a776b5f245d792e97674a66711b94262bed8060 (patch) | |
| tree | dbcc66161a7a39212032cb5abdb526d089ba239c | |
| parent | 13d90b93f6dccfd6f19656e034d3d2a987b0c1ce (diff) | |
| parent | 29d5414928540044fbd5c007ff959bf8e92b7821 (diff) | |
Merge "installd: Wait indefinitely for the subprocess if pidfd_open fails." am: 29d5414928
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2148827
Change-Id: I1dc6132c1da5c62af0349e594c686477da8cdf45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | cmds/installd/utils.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmds/installd/utils.cpp b/cmds/installd/utils.cpp index 45aeab6fa8..4d9b71016e 100644 --- a/cmds/installd/utils.cpp +++ b/cmds/installd/utils.cpp @@ -1184,8 +1184,8 @@ static int wait_child(pid_t pid) { int wait_child_with_timeout(pid_t pid, int timeout_ms) { int pidfd = pidfd_open(pid, /*flags=*/0); if (pidfd < 0) { - PLOG(ERROR) << "pidfd_open failed for pid " << pid; - kill(pid, SIGKILL); + PLOG(ERROR) << "pidfd_open failed for pid " << pid + << ", waiting for child process without timeout"; return wait_child(pid); } |