| commit | 10a124d342530b4c366f08d3a899474c4e5eb7fc | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Mon Jun 01 21:16:57 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Jun 01 21:16:57 2015 +0000 |
| tree | a6c608e0e1d1c37c25a4cadb21436b55ffdb2376 | |
| parent | fba413d831766c3ed871b9787f60d9111045b36f [diff] | |
| parent | c5bf3b830472bca677407833018f20b7643953fe [diff] |
Merge "logd: whitelist should not preserve expire messages"
diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp index 913e1f1..1da52d8 100644 --- a/logd/LogBuffer.cpp +++ b/logd/LogBuffer.cpp
@@ -524,7 +524,7 @@ break; } - if (hasWhitelist && mPrune.nice(e)) { // WhiteListed + if (hasWhitelist && !e->getDropped() && mPrune.nice(e)) { // WhiteListed whitelist = true; it++; continue;