diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2015-05-21 12:50:31 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2015-06-01 14:27:02 -0700 |
| commit | 222f8c3ac7315684ce17d125f5732edad352ab1e (patch) | |
| tree | 9e65d48cc4ac503e68ea49fb305892c3aa1e0b8d /logd | |
| parent | fbf96b55d98e9042fe6f240fbcf3103faca8650d (diff) | |
| download | system_core-222f8c3ac7315684ce17d125f5732edad352ab1e.zip system_core-222f8c3ac7315684ce17d125f5732edad352ab1e.tar.gz system_core-222f8c3ac7315684ce17d125f5732edad352ab1e.tar.bz2 | |
logd: whitelist should not preserve expire messages
(cherry pick from commit c5bf3b830472bca677407833018f20b7643953fe)
Change-Id: I56275c73191b96aa21e7b4049d401e1f44211f9b
Diffstat (limited to 'logd')
| -rw-r--r-- | logd/LogBuffer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ void LogBuffer::prune(log_id_t id, unsigned long pruneRows, uid_t caller_uid) { break; } - if (hasWhitelist && mPrune.nice(e)) { // WhiteListed + if (hasWhitelist && !e->getDropped() && mPrune.nice(e)) { // WhiteListed whitelist = true; it++; continue; |