commit 05f897cae9b8590c43717b3492e470fa0197c330
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 08 21:09:50 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 08 21:09:50 2022 +0000
tree 40111e0699f6be1bd40d1f70f5c1ac500fc0d964
parent d4aa87c5c236b7c484ccf6ca8a5082db8cf23840
parent a543a842e0dbab6f2801afa80837402e9cd85052

Merge "libbinder: eliminate Binder.cpp dependency on IShellCallback"

cmds/installd/utils.cpp

diff --git a/cmds/installd/utils.cpp b/cmds/installd/utils.cpp
index c7bea3f..65b25a4 100644
--- a/cmds/installd/utils.cpp
+++ b/cmds/installd/utils.cpp
@@ -1182,8 +1182,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);
     }