commit 8a67644905c72bd694798c8de53862859ea12257
author Mark Salyzyn <salyzyn@google.com> Thu Apr 30 20:47:02 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 30 20:47:02 2015 +0000
tree bd2caa716ecd123a8fa310a61aea9fc6950f294d
parent 39fa51e733768b6acde5b5104812956ae1bb031c
parent 66c2a551f22cdcf77d514e2b1cf552a2a9ffdb32

am fe680483: am f24e49ad: Merge "logd: reduce chance of dropped 1 messages"

* commit 'fe680483889b730ff58bf917984c889f0f0c9523':
  logd: reduce chance of dropped 1 messages

logd/LogBuffer.cpp

diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp
index 1dced11..62f29e7 100644
--- a/logd/LogBuffer.cpp
+++ b/logd/LogBuffer.cpp
@@ -295,7 +295,8 @@
         uint64_t current = e->getRealTime().nsec() - NS_PER_SEC;
         ssize_t index = -1;
         while((index = next(index)) >= 0) {
-            if (current > editEntryAt(index).getLast()->getRealTime().nsec()) {
+            LogBufferElement *l = editEntryAt(index).getLast();
+            if ((l->getDropped() >= 4) && (current > l->getRealTime().nsec())) {
                 removeAt(index);
                 index = -1;
             }