commit 652d1535f1a53b49273ec58d921188e2499e914d
author Mark Salyzyn <salyzyn@google.com> Tue May 16 15:21:23 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 16 15:21:23 2017 +0000
tree 2e86071aca623f29ea36a910812162cde55c8d53
parent 7907a4b337ff25f5ca02befab4a8c1c408deab73
parent b3a3f39950df5dc84f23d478d6649708b9c5b4e0

Merge "logd: remove start filtration from flushTo"
am: c8c49988b1

Change-Id: I7be86455b6bb3930e8e37810208f237df202af31

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();