commit ce0fb8c6bd1e37523e96a0ec33363f5fa58a35b7
author Mark Salyzyn <salyzyn@google.com> Wed May 17 21:52:26 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 17 21:52:26 2017 +0000
tree 02032206d57b83716ea345dfdca3693ee393c338
parent 250812bcb0220de45d05d0f0537eccbe99535663
parent 90eb177d01d59b0de817c2fdc08737c15d55a421

Merge "Revert "logd: remove start filtration from flushTo"" am: 8cfd2971ec am: f111b04f15 am: ef53957a7e
am: 87265fd5bb

Change-Id: I2da6c0a7b6ad835e21995f51e5841d583fe1d251

logd/LogBuffer.cpp

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