commit 0d871fda8d91bcdac00b163b50c22fe68c6d56de
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 08 20:16:38 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 08 20:16:38 2022 +0000
tree bcc11cd852cdb41e0bedd763045f6bb425ed4fc8
parent 0b0c5ef5f494027a34da08f251e156b0c88499d6
parent 1dc41b2d7e84f8ef3b685776b2b0c5328e6a3ecf

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

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

Change-Id: I7053269b66a1d2115cdad3477da7f21f1178a9a6
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);
     }