commit 6c915528d3fc6e51557d0ad26016080a8ca064ce
author Mark Salyzyn <salyzyn@google.com> Thu Sep 01 07:28:44 2016 -0700
committer Mark Salyzyn <salyzyn@google.com> Fri Sep 02 10:36:13 2016 -0700
tree df85fc4a07bd71cdfda2a1ac807817c0f1ef9bf4
parent 67ca12c5e229e247cc0e024188589e3ab80589d5

logd: crash in prune mLastWorstPidOfSystem

(cherry-pick from commit 1eefca281ee837d183e49951ae29683d8665129a)

mLastWorstPidOfSystem is supposed to be indexed by element->getPid()

Bug: 31237377
Bug: 30797725
Bug: 30688716
Change-Id: I81a55e92f175ded1c571a0aa8836736d86b36b1d

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())