diff options
| author | Tom Cherry <tomcherry@google.com> | 2019-10-25 10:30:23 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-10-25 10:30:23 -0700 |
| commit | 1c1fe36cbc62e4c436ced0b3a1dd92c99d10a03f (patch) | |
| tree | 9671168f0491e90c4274fa8c186d073ef38cd913 /cmds/incidentd/src/Section.cpp | |
| parent | f5b0ba407259691c36de98997db951ae403b3081 (diff) | |
| parent | 7bd9dcd63e341c8216db1a0c72fcca2b1423743d (diff) | |
Merge "Remove legacy logger_entry_v* structs" am: 4be2934e61 am: 2ff78bb657
am: 7bd9dcd63e
Change-Id: Ib3efe7429d0247a51b3a5fbf256762c08c6881af
Diffstat (limited to 'cmds/incidentd/src/Section.cpp')
| -rw-r--r-- | cmds/incidentd/src/Section.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cmds/incidentd/src/Section.cpp b/cmds/incidentd/src/Section.cpp index 1572114c639f..f476fcf91bd5 100644 --- a/cmds/incidentd/src/Section.cpp +++ b/cmds/incidentd/src/Section.cpp @@ -546,16 +546,16 @@ status_t LogSection::BlockingCall(int pipeWriteFd) const { ; android_log_list_element elem; - lastTimestamp.tv_sec = msg.entry_v1.sec; - lastTimestamp.tv_nsec = msg.entry_v1.nsec; + lastTimestamp.tv_sec = msg.entry.sec; + lastTimestamp.tv_nsec = msg.entry.nsec; // format a BinaryLogEntry uint64_t token = proto.start(LogProto::BINARY_LOGS); - proto.write(BinaryLogEntry::SEC, msg.entry_v1.sec); - proto.write(BinaryLogEntry::NANOSEC, msg.entry_v1.nsec); - proto.write(BinaryLogEntry::UID, (int)msg.entry_v4.uid); - proto.write(BinaryLogEntry::PID, msg.entry_v1.pid); - proto.write(BinaryLogEntry::TID, msg.entry_v1.tid); + proto.write(BinaryLogEntry::SEC, (int32_t)msg.entry.sec); + proto.write(BinaryLogEntry::NANOSEC, (int32_t)msg.entry.nsec); + proto.write(BinaryLogEntry::UID, (int)msg.entry.uid); + proto.write(BinaryLogEntry::PID, msg.entry.pid); + proto.write(BinaryLogEntry::TID, (int32_t)msg.entry.tid); proto.write(BinaryLogEntry::TAG_INDEX, get4LE(reinterpret_cast<uint8_t const*>(msg.msg()))); do { @@ -603,7 +603,7 @@ status_t LogSection::BlockingCall(int pipeWriteFd) const { } } else { AndroidLogEntry entry; - err = android_log_processLogBuffer(&msg.entry_v1, &entry); + err = android_log_processLogBuffer(&msg.entry, &entry); if (err != NO_ERROR) { ALOGW("[%s] fails to process to an entry.\n", this->name.string()); break; |