| commit | 41aa930bb64790ee00d7d658fb561f18b5a95a2e | [log] [tgz] |
|---|---|---|
| author | Rubin Xu <rubinxu@google.com> | Mon May 09 15:32:15 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon May 09 15:32:15 2016 +0000 |
| tree | 058d6579c2a74fa1918e463548c434c52f5e36a6 | |
| parent | 1dbd8134c09960cc52c7656a43b453223097b9e9 [diff] | |
| parent | 4a3c3ea979f8ab7a2fd38a39f98352c024140713 [diff] |
Merge "Return correct length from pmsgRead()" am: fc2a8b2bd6 * commit 'fc2a8b2bd605e4639db0feaab49c516c0ae90180': Return correct length from pmsgRead() Change-Id: I868b2ad0258edd409f10fdf8bfb27f44c39de77d
diff --git a/liblog/pmsg_reader.c b/liblog/pmsg_reader.c index f5e91c8..2e4fc5d 100644 --- a/liblog/pmsg_reader.c +++ b/liblog/pmsg_reader.c
@@ -227,7 +227,7 @@ log_msg->entry_v4.uid = buf.p.uid; } - return ret; + return ret + log_msg->entry_v4.hdr_size; } }