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

am: ae6aa1f1ed * commit 'ae6aa1f1ed2a342b826b4e3a69267af8284ba52f': logd: wrap timed entry too early, timeout immediately
2016-01-12 22:04:00 +00:00 · 2016-01-12 22:04:00 +00:00 · 15bc48b75e
parent 44e06f5f00 ae6aa1f1ed
commit 15bc48b75e
1 changed files with 1 additions and 1 deletions
--- a/logd/FlushCommand.cpp
+++ b/logd/FlushCommand.cpp
@ -36,7 +36,7 @@ FlushCommand::FlushCommand(LogReader &reader,
        mLogMask(logMask),
        mPid(pid),
        mStart(start),
-        mTimeout(timeout) {
+        mTimeout((start > 1) ? timeout : 0) {
 }

 // runSocketCommand is called once for every open client on the