commit a55c480c7d8809222a6f8d62280cc99cc2db5032
author Mark Salyzyn <salyzyn@google.com> Wed Aug 26 17:54:53 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 26 17:54:53 2015 +0000
tree e7f5ff5f52117df6d60eb88c6bd239f1c58e7abd
parent a84f0766e4ec1f2759b91b090a828b63279eb310
parent 81b88042f5ea1e8bf7210d3cd3c2474444387b32

am 64393789: Merge "logd: worst uid record watermark part deux"

* commit '64393789227b303fa142690efe34ab3ffc567475':
  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;
             }