| commit | 6fe4fc52e3de46bafe0970d2f416bd1402a2ff10 | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Tue Jan 12 21:57:50 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Jan 12 21:57:50 2016 +0000 |
| tree | a18683edda182a2e9edc5102c86388677e3ac3fc | |
| parent | 115c8dd25191a2c4ad50b0c31d65ed4c0145dcbe [diff] | |
| parent | deb4d716a46d2da5648cb5d81c02ad66ffa9d054 [diff] |
Merge "logd: wrap timed entry too early, timeout immediately"
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