commit 81b88042f5ea1e8bf7210d3cd3c2474444387b32
author Mark Salyzyn <salyzyn@google.com> Wed Aug 26 17:49:53 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 26 17:49:53 2015 +0000
tree e7f5ff5f52117df6d60eb88c6bd239f1c58e7abd
parent db24c3872245498c3333865d6f124c697cf71486
parent 2838157287cae0ac04ace6880c12d7c576c71f9c

Merge "logd: worst uid record watermark part deux"

logd/LogBuffer.cpp

diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp
index 6ea4109..c609870 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;
             }