commit 259204b7a88d293f6ce9a113cec1ad6a00048f30
author Mark Salyzyn <salyzyn@google.com> Tue Mar 28 15:12:44 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Mar 28 15:12:44 2017 +0000
tree 745a37be0e3b727fb3388395344aba26605ba60f
parent 35860411f5e6b3374d655069b7a4ea1d2bf3526d
parent 58c114a94d0a8a03c860e8b914cb794dbee72fd8

Merge "logd: strip out empty trailing iovec" am: 6b11faeb42
am: d749a054ff

Change-Id: If8441997a5cefc4af09d3930a23ae69412ce11fa

logd/LogBufferElement.cpp

diff --git a/logd/LogBufferElement.cpp b/logd/LogBufferElement.cpp
index 81356fe..04a620c 100644
--- a/logd/LogBufferElement.cpp
+++ b/logd/LogBufferElement.cpp
@@ -235,7 +235,9 @@
     }
     iovec[1].iov_len = entry.len;
 
-    log_time retval = reader->sendDatav(iovec, 2) ? FLUSH_ERROR : mRealTime;
+    log_time retval = reader->sendDatav(iovec, 1 + (entry.len != 0))
+                          ? FLUSH_ERROR
+                          : mRealTime;
 
     if (buffer) free(buffer);