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

Commit 0eb3501c 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

Change-Id: Ic5f18f9f2fe2ad575e9f923f9688ee3e94da4539
parents a5b22040 b1d961a4

logd/LogReader.cpp

+4 −0
Original line number Original line Diff line number Diff line
@@ -212,6 +212,10 @@ bool LogReader::onDataAvailable(SocketClient* cli) { 
        cli->getUid(), cli->getGid(), cli->getPid(), nonBlock ? 'n' : 'b', tail,

        cli->getUid(), cli->getGid(), cli->getPid(), nonBlock ? 'n' : 'b', tail,

        logMask, (int)pid, sequence.nsec(), timeout);

        logMask, (int)pid, sequence.nsec(), timeout);





    if (sequence == log_time::EPOCH) {

        timeout = 0;

    }



    LogTimeEntry::wrlock();

    LogTimeEntry::wrlock();

    auto entry = std::make_unique<LogTimeEntry>(

    auto entry = std::make_unique<LogTimeEntry>(

        *this, cli, nonBlock, tail, logMask, pid, sequence, timeout);

        *this, cli, nonBlock, tail, logMask, pid, sequence, timeout);