Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1dc41b2d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "installd: Wait indefinitely for the subprocess if pidfd_open fails."... 

Merge "installd: Wait indefinitely for the subprocess if pidfd_open fails." am: 29d54149 am: 7a776b5f am: 884f98f1 am: efc8ecf6

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



Change-Id: Id354da3618dfc2f3fc21d89cb2fa9487c4caf44c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7947a84b efc8ecf6

cmds/installd/utils.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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);

    }