commit 526667b62be52fe323c8f708e5f4613c80ed54f3
author Mark Salyzyn <salyzyn@google.com> Fri Sep 02 20:00:11 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 02 20:00:11 2016 +0000
tree 4ba8e6675c252d4e66404bdf97a8df3daa6d66af
parent 9884440311bcb541a1257e994e7488aebe0239ed
parent 0c3b74b5a9bb63f48fcec8f8ea5feb7932dae3e1

logd: crash in prune mLastWorstPidOfSystem
am: 6c915528d3

Change-Id: Ia4a46bde38fcf3e0e05099b6bb42e9d1c82c73de

logd/LogBuffer.cpp

diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp
index 8c30f79..79a7e8c 100644
--- a/logd/LogBuffer.cpp
+++ b/logd/LogBuffer.cpp
@@ -691,7 +691,7 @@
                         && ((!gc && (element->getPid() == worstPid))
                             || (mLastWorstPidOfSystem[id].find(element->getPid())
                                 == mLastWorstPidOfSystem[id].end()))) {
-                    mLastWorstPidOfSystem[id][element->getUid()] = it;
+                    mLastWorstPidOfSystem[id][element->getPid()] = it;
                 }
                 if ((!gc && !worstPid && (element->getUid() == worst))
                         || (mLastWorstUid[id].find(element->getUid())