commit ad8ca686813951ccbd4c0eda30c913f21ac37fac
author Suren Baghdasaryan <surenb@google.com> Wed Aug 01 19:55:13 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Aug 01 19:55:13 2018 -0700
tree b95f8c14a071c20c6c936d5039b07767c14b2103
parent bf6c0316e557914bb9e0ef009ad02c78525bf521
parent a34a54e8a9c5a66f8c10f67c4798a6e25988f86e

Merge "liblog: Add functions to reset log context"
am: a34a54e8a9

Change-Id: I5b152fe9b6647f0e36b9c4e604bfa053778c69d2

logd/LogBuffer.cpp

diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp
index a78319f..9b04363 100644
--- a/logd/LogBuffer.cpp
+++ b/logd/LogBuffer.cpp
@@ -1115,9 +1115,6 @@
         // client wants to start from the beginning
         it = mLogElements.begin();
     } else {
-        // 3 second limit to continue search for out-of-order entries.
-        log_time min = start - pruneMargin;
-
         // Cap to 300 iterations we look back for out-of-order entries.
         size_t count = 300;
 
@@ -1133,7 +1130,7 @@
             } else if (element->getRealTime() == start) {
                 last = ++it;
                 break;
-            } else if (!--count || (element->getRealTime() < min)) {
+            } else if (!--count) {
                 break;
             }
         }