commit d3380465c206d41b388e23469b03e07ff38ddc4c
author Mark Salyzyn <salyzyn@google.com> Wed Jan 13 18:56:40 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 13 18:56:40 2016 +0000
tree aac8019f23e11606ef32cd3aa65e7187d2b9fb40
parent 363d7cc205c787c4ef19425741ce26640a4941c6
parent 15bc48b75e7c2d40a9af5b4d1bf8c4ca9a267a79

Merge "logd: wrap timed entry too early, timeout immediately" am: ae6aa1f1ed
am: 15bc48b75e

* commit '15bc48b75e7c2d40a9af5b4d1bf8c4ca9a267a79':
  logd: wrap timed entry too early, timeout immediately

logd/FlushCommand.cpp

diff --git a/logd/FlushCommand.cpp b/logd/FlushCommand.cpp
index cb3d1c2..48036d3 100644
--- a/logd/FlushCommand.cpp
+++ b/logd/FlushCommand.cpp
@@ -36,7 +36,7 @@
         mLogMask(logMask),
         mPid(pid),
         mStart(start),
-        mTimeout(timeout) {
+        mTimeout((start > 1) ? timeout : 0) {
 }
 
 // runSocketCommand is called once for every open client on the