Merge "Preventing zombie process creation." into pi-dev am: ca6f36532d

am: 193c893b01

Change-Id: Id32203ab069343410a02c03956a7c6135f8a1b33

diff --cc cmds/incidentd/src/Section.cpp
index 6d5737d,0e72fc0..78876a3
--- 1/cmds/incidentd/src/Section.cpp
--- 2/cmds/incidentd/src/Section.cpp
+++ b/cmds/incidentd/src/Section.cpp
@@@ -864,8 -902,10 +864,10 @@@ status_t TombstoneSection::BlockingCall
          // Read from the pipe concurrently to avoid blocking the child.
          FdBuffer buffer;
          err = buffer.readFully(dumpPipe.readFd().get());
+         // Wait on the child to avoid it becoming a zombie process.
+         status_t cStatus = wait_child(child);
          if (err != NO_ERROR) {
 -            ALOGW("TombstoneSection '%s' failed to read stack dump: %d", this->name.string(), err);
 +            ALOGW("[%s] failed to read stack dump: %d", this->name.string(), err);
              dumpPipe.readFd().reset();
              break;
          }