commit 671c4a0d9f39394525d4a84d1ebc9f69ef193f11
author Yifan Hong <elsk@google.com> Sat May 13 01:40:58 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat May 13 01:40:58 2017 +0000
tree 22aaa2d829090e83eb88acba44aa68ed2ace47f5
parent 8a730a5e2cf2f32426b9974c4d38c0e38f49373e
parent 681af84df2f69d78674dedf5b6a2aef526a7778d

Merge "Actually remove dead processes from lshal" am: 28765c6184 am: d52b085d44 am: e69eaddc3e
am: 681af84df2

Change-Id: I9e066dcb2b9a165c2642ea393ad30d323f898c16

cmds/lshal/ListCommand.cpp

diff --git a/cmds/lshal/ListCommand.cpp b/cmds/lshal/ListCommand.cpp
index fe2a7ca..710b6e4 100644
--- a/cmds/lshal/ListCommand.cpp
+++ b/cmds/lshal/ListCommand.cpp
@@ -68,9 +68,9 @@
 
 void ListCommand::removeDeadProcesses(Pids *pids) {
     static const pid_t myPid = getpid();
-    std::remove_if(pids->begin(), pids->end(), [this](auto pid) {
+    pids->erase(std::remove_if(pids->begin(), pids->end(), [this](auto pid) {
         return pid == myPid || this->getCmdline(pid).empty();
-    });
+    }), pids->end());
 }
 
 bool ListCommand::getReferencedPids(