commit 6df12a5d42f8e69f45ca2e606624b1aac097ffb7
author Mark Salyzyn <salyzyn@google.com> Tue Sep 01 20:31:29 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 01 20:31:29 2015 +0000
tree bc9932f5211e9eac846dbd0b357f9f7219130231
parent 6d8d1bbf6dec29e99dec2f0101a53c95ae074129
parent 0b1ff94830b222498ea439f09f91b7e252e078f0

am bd44f59f: Merge "logd: worst uid record watermark part deux" into mnc-dr-dev

* commit 'bd44f59f5b1b7d08b5643563b9ab9abfb375e67e':
  logd: worst uid record watermark part deux

logd/LogBuffer.cpp

diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp
index db3f26c..e732b8e 100644
--- a/logd/LogBuffer.cpp
+++ b/logd/LogBuffer.cpp
@@ -467,7 +467,11 @@
             // unmerged drop message
             if (dropped) {
                 last.add(e);
-                mLastWorstUid[id][e->getUid()] = it;
+                if ((e->getUid() == worst)
+                        || (mLastWorstUid[id].find(e->getUid())
+                            == mLastWorstUid[id].end())) {
+                    mLastWorstUid[id][e->getUid()] = it;
+                }
                 ++it;
                 continue;
             }