commit 82728498471b33a1f8c539068a4143196e284b5e
author Mark Salyzyn <salyzyn@google.com> Tue Jan 12 22:04:00 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 12 22:04:00 2016 +0000
tree 1b47131161b5f9e7c5e25b6197ba417a1e02ab17
parent 57a8efb870a3358fbaa86baf0768750f9c571d28
parent 6fe4fc52e3de46bafe0970d2f416bd1402a2ff10

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

* commit 'ae6aa1f1ed2a342b826b4e3a69267af8284ba52f':
  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