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

am: d749a054ff

Change-Id: If8441997a5cefc4af09d3930a23ae69412ce11fa
This commit is contained in:
Mark Salyzyn 2017-03-28 15:12:44 +00:00 committed by android-build-merger
commit 657ae57bf3

View file

@ -235,7 +235,9 @@ log_time LogBufferElement::flushTo(SocketClient* reader, LogBuffer* parent,
}
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);