commit 435a5ec436ef43d06a9dfc55bce3bc80850a2042
author Mark Salyzyn <salyzyn@google.com> Tue May 16 15:36:28 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 16 15:36:28 2017 +0000
tree b4a3700d24e6fad20b2ddd2533e4124cd5f00360
parent 88fd6ad44abd56fe64811b5d62a88f392e1d8dc8
parent c3f60bf83d3825a7e7ab7b11bb6f7e60984612b7

Merge "logd: remove start filtration from flushTo" am: c8c49988b1 am: 27d54dd4ac am: 8ab4f5eafc
am: 4cc6519741

Change-Id: I97938b98a8d1a1a6e57851c7f356df5d2f2d3c08

logd/LogBuffer.cpp

diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp
index e4636c3..e25a48d 100644
--- a/logd/LogBuffer.cpp
+++ b/logd/LogBuffer.cpp
@@ -1144,10 +1144,6 @@
             continue;
         }
 
-        if (element->getRealTime() <= start) {
-            continue;
-        }
-
         // NB: calling out to another object with wrlock() held (safe)
         if (filter) {
             int ret = (*filter)(element, arg);
@@ -1174,11 +1170,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();