commit d6564fb13606eb4a6e98492cff64a4a5445d768f
author Tom Cherry <tomcherry@google.com> Fri Oct 19 17:19:16 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Oct 19 17:19:16 2018 -0700
tree 3d2cccfadffb567ce372755d5fca170a2e24461a
parent f1aede0adbef20c69edca2eec135817569b0e0a8
parent d6afeea15f8b0a67553940a999133ff8b1edcdb6

Merge "logd: clear timeout if no start time is given" am: 5336d40ed4
am: b1d961a423

Change-Id: Ic5f18f9f2fe2ad575e9f923f9688ee3e94da4539

logd/LogReader.cpp

diff --git a/logd/LogReader.cpp b/logd/LogReader.cpp
index 13c7af3..9db8c00 100644
--- a/logd/LogReader.cpp
+++ b/logd/LogReader.cpp
@@ -212,6 +212,10 @@
         cli->getUid(), cli->getGid(), cli->getPid(), nonBlock ? 'n' : 'b', tail,
         logMask, (int)pid, sequence.nsec(), timeout);
 
+    if (sequence == log_time::EPOCH) {
+        timeout = 0;
+    }
+
     LogTimeEntry::wrlock();
     auto entry = std::make_unique<LogTimeEntry>(
         *this, cli, nonBlock, tail, logMask, pid, sequence, timeout);