commit cf78c36a0f87bc542415ab50d3d81ab9a052a406
author Mark Salyzyn <salyzyn@google.com> Wed May 17 21:41:08 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 17 21:41:08 2017 +0000
tree 2376714c4a6ba77dee1a808a102e490d4899c56c
parent 91e2bc6c10693781042ac54d4c9fea7af9cb2ced
parent 09e3f5b8d19b576ae90325c26a2c9a5a92b1dc7b

Merge "Revert "logd: remove start filtration from flushTo""
am: 8cfd2971ec

Change-Id: Ic52a26216b04ee36b15f4665d9c7741079e192ea

logd/LogBuffer.cpp

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