commit edc3730193875d1abe92f9196c2996b71c414b24
author Nick Kralevich <nnk@google.com> Wed Aug 26 18:30:59 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 26 18:30:59 2015 +0000
tree 8ddc2abb2f1cb2774e430eb73aca025c77b27203
parent 81b88042f5ea1e8bf7210d3cd3c2474444387b32
parent be2d522600545fc394958fff5ac20807cfb82b7e

Merge "libcutils: cleanups for -fsanitize=integer"

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