| commit | ae6aa1f1ed2a342b826b4e3a69267af8284ba52f | [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 | b45f8179be0fc14f86d5076bdc75a58cca5ef46b [diff] | |
| parent | 015709784537755d42ea564a558c0eae5b1d1546 [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