summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-10-15 00:01:39 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-15 00:01:39 +0000
commit4f083c6156cb59eddcb52094da7972f16dde2220 (patch)
tree0480a14ea744e2185d2578303b5dde8b4c6df612
parent3f95c89db68f4d609c0ccafa4e9e7376852c9b48 (diff)
parenta8aad1667ff191cbc3972c40e8f9ec960db4ef96 (diff)
downloadsystem_core-4f083c6156cb59eddcb52094da7972f16dde2220.zip
system_core-4f083c6156cb59eddcb52094da7972f16dde2220.tar.gz
system_core-4f083c6156cb59eddcb52094da7972f16dde2220.tar.bz2
am a8aad166: Merge "logd: insert order for first entry"
* commit 'a8aad1667ff191cbc3972c40e8f9ec960db4ef96': logd: insert order for first entry
-rw-r--r--logd/LogBuffer.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp
index 8c1c344..1c74ba5 100644
--- a/logd/LogBuffer.cpp
+++ b/logd/LogBuffer.cpp
@@ -147,7 +147,8 @@ void LogBuffer::log(log_id_t log_id, log_time realtime,
// NB: if end is region locked, place element at end of list
LogBufferElementCollection::iterator it = mLogElements.end();
LogBufferElementCollection::iterator last = it;
- while (--it != mLogElements.begin()) {
+ while (last != mLogElements.begin()) {
+ --it;
if ((*it)->getRealTime() <= realtime) {
// halves the peak performance, use with caution
if (dgramQlenStatistics) {