commit bd44f59f5b1b7d08b5643563b9ab9abfb375e67e
author Mark Salyzyn <salyzyn@google.com> Tue Sep 01 20:11:00 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 01 20:11:00 2015 +0000
tree 4e865d65aa0452eb1ed98f6af74208c61dc78c0e
parent bc193c53ecc740d0ac3de976c6654b90a24669b6
parent aa58a86275158c563e37e0482d49e9927a742e19

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

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;
             }