Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit adf7dee9 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge "logd: remove start filtration from flushTo" am: c8c49988 am: 27d54dd4 am: 8ab4f5ea 

am: 4cc65197

Change-Id: I97938b98a8d1a1a6e57851c7f356df5d2f2d3c08
parents 9b41af31 4cc65197

logd/LogBuffer.cpp

+3 −8
Original line number Diff line number Diff line
@@ -1144,10 +1144,6 @@ log_time LogBuffer::flushTo(SocketClient* reader, const log_time& start, 
            continue;

        }



        if (element->getRealTime() <= start) {

            continue;

        }



        // NB: calling out to another object with wrlock() held (safe)

        if (filter) {

            int ret = (*filter)(element, arg);
@@ -1174,11 +1170,10 @@ log_time LogBuffer::flushTo(SocketClient* reader, const log_time& start, 
        unlock();



        // range locking in LastLogTimes looks after us

        max = element->flushTo(reader, this, privileged, sameTid);

        log_time next = element->flushTo(reader, this, privileged, sameTid);



        if (max == element->FLUSH_ERROR) {

            return max;

        }

        if (next == element->FLUSH_ERROR) return next;

        if (next > max) max = next;



        skip = maxSkip;

        rdlock();