commit eaefedee336af9602172c744f92db982dee1eee7
author Mark Salyzyn <salyzyn@google.com> Mon Jun 01 21:23:37 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 01 21:23:37 2015 +0000
tree a6c608e0e1d1c37c25a4cadb21436b55ffdb2376
parent 4672523e89dd5b1fc71e3e13c424ee3a770fb1db
parent 6e38017ee37974e747968f8c0d7dfa1426e56036

am 10a124d3: Merge "logd: whitelist should not preserve expire messages"

* commit '10a124d342530b4c366f08d3a899474c4e5eb7fc':
  logd: whitelist should not preserve expire messages

logd/LogBuffer.cpp

diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp
index 913e1f1..1da52d8 100644
--- a/logd/LogBuffer.cpp
+++ b/logd/LogBuffer.cpp
@@ -524,7 +524,7 @@
             break;
         }
 
-        if (hasWhitelist && mPrune.nice(e)) { // WhiteListed
+        if (hasWhitelist && !e->getDropped() && mPrune.nice(e)) { // WhiteListed
             whitelist = true;
             it++;
             continue;