commit c8c49988b149dc65c56bd6f3dbd4daac40d7420a
author Treehugger Robot <treehugger-gerrit@google.com> Tue May 16 15:11:31 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 16 15:11:34 2017 +0000
tree 2e86071aca623f29ea36a910812162cde55c8d53
parent b9b95ee3a9dfa05008d783081d6e7db7d56d0574
parent 982ad208b5e4d83f966ee4c10ad4f606417bcda6

Merge "logd: remove start filtration from flushTo"

logd/LogBuffer.cpp

diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp
index ded6c8c..fbed83b 100644
--- a/logd/LogBuffer.cpp
+++ b/logd/LogBuffer.cpp
@@ -1142,10 +1142,6 @@
             continue;
         }
 
-        if (element->getRealTime() <= start) {
-            continue;
-        }
-
         // NB: calling out to another object with wrlock() held (safe)
         if (filter) {
             int ret = (*filter)(element, arg);
@@ -1172,11 +1168,10 @@
         unlock();
 
         // range locking in LastLogTimes looks after us
-        max = element->flushTo(reader, this, privileged, sameTid);
+        log_time next = element->flushTo(reader, this, privileged, sameTid);
 
-        if (max == element->FLUSH_ERROR) {
-            return max;
-        }
+        if (next == element->FLUSH_ERROR) return next;
+        if (next > max) max = next;
 
         skip = maxSkip;
         rdlock();