commit 5a9d33ee1cc2acd776193eef479fabfefcdaf865
author Mark Salyzyn <salyzyn@google.com> Thu Apr 23 07:47:54 2015 -0700
committer Mark Salyzyn <salyzyn@google.com> Thu Apr 30 13:24:59 2015 -0700
tree 47452ec60aaaf98b08a5dfc54c3c89b4fa765828
parent f1a58f8f33509201cabe71c6a9d01aa6b8f99966

logd: reduce chance of dropped 1 messages

- do not time out at 1 second if drop has count of less than 4

(Cherry picked from commit 35173a9ac5bd1f4702ccfda3df02ec47ecb57949)

Bug: 20334069
Bug: 20370119
Change-Id: I787cb553dfab5ed71abd6ed72b63de675f834e0c

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