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

Commit d783e999 authored by Tom Cherry's avatar Tom Cherry Committed by android-build-merger
Browse files

Merge "logd: clear timeout if no start time is given" am: 5336d40e am: b1d961a4 

am: 0eb3501c

Change-Id: I1ad5c940f3981238185dbdebae388364b22cdd28
parents 7b1c17fa 0eb3501c

logd/LogReader.cpp

+4 −0
Original line number Diff line number Diff line
@@ -212,6 +212,10 @@ bool LogReader::onDataAvailable(SocketClient* cli) { 
        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);