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

Commit 228a3945 authored by Tom Cherry's avatar Tom Cherry Committed by Automerger Merge Worker
Browse files

Merge "liblog: fix reading pmsg" am: a6dd5573 am: 2dc7952e am: 8eb9df64 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1341014

Change-Id: I4a23cf53afecec2018eeebcc139d6cc9a9555214
parents 10e946d6 8eb9df64

liblog/pmsg_reader.cpp

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ int PmsgRead(struct logger_list* logger_list, struct log_msg* log_msg) { 
          ((logger_list->start.tv_sec != buf.l.realtime.tv_sec) ||

           (logger_list->start.tv_nsec <= buf.l.realtime.tv_nsec)))) &&

        (!logger_list->pid || (logger_list->pid == buf.p.pid))) {

      char* msg = reinterpret_cast<char*>(&log_msg->entry) + log_msg->entry.hdr_size;

      char* msg = reinterpret_cast<char*>(&log_msg->entry) + sizeof(log_msg->entry);

      *msg = buf.prio;

      fd = atomic_load(&logger_list->fd);

      if (fd <= 0) {