Revert "logd: remove start filtration from flushTo"
Regressed by introducing too much overlap in the results.
This reverts commit 982ad208b5e4d83f966ee4c10ad4f606417bcda6.
Bug: 38341453
Change-Id: I9d630a6b9f3e464f523424b640090f7e268da9bd
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();