commit 1dc41b2d7e84f8ef3b685776b2b0c5328e6a3ecf
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 08 19:57:43 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 08 19:57:43 2022 +0000
tree 724b9de72660b3c5cd021df8efd0988d608954b0
parent 7947a84bca3c462a223c84a1e770b31c824aaa74
parent efc8ecf6aa9fc506bf4298139f9e34f3c2118234

Merge "installd: Wait indefinitely for the subprocess if pidfd_open fails." am: 29d5414928 am: 7a776b5f24 am: 884f98f1a1 am: efc8ecf6aa

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2148827

Change-Id: Id354da3618dfc2f3fc21d89cb2fa9487c4caf44c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

cmds/installd/utils.cpp

diff --git a/cmds/installd/utils.cpp b/cmds/installd/utils.cpp
index 45aeab6..4d9b710 100644
--- a/cmds/installd/utils.cpp
+++ b/cmds/installd/utils.cpp
@@ -1184,8 +1184,8 @@
 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);
     }