commit dac2a491f22671faf93b131ba8608e706777943e
author The Android Automerger <android-build@google.com> Thu Nov 05 01:01:00 2015 -0800
committer The Android Automerger <android-build@google.com> Thu Nov 05 01:01:00 2015 -0800
tree a50d13d5c0a9d013658fde1dc7ff99572483d59f
parent f12cab256c60e3f60a54a0305e98a5787d1d1e0a
parent 44bcbd7974d5fb66d937dd55c5bf69e580c94aa4

merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev

logd/LogBuffer.cpp

diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp
index 559fa2e..d72a78c 100644
--- a/logd/LogBuffer.cpp
+++ b/logd/LogBuffer.cpp
@@ -435,7 +435,10 @@
                     worst_sizes = sorted[0]->getSizes();
                     // Calculate threshold as 12.5% of available storage
                     size_t threshold = log_buffer_size(id) / 8;
-                    if (worst_sizes > threshold) {
+                    if ((worst_sizes > threshold)
+                        // Allow time horizon to extend roughly tenfold, assume
+                        // average entry length is 100 characters.
+                            && (worst_sizes > (10 * sorted[0]->getDropped()))) {
                         worst = sorted[0]->getKey();
                         second_worst_sizes = sorted[1]->getSizes();
                         if (second_worst_sizes < threshold) {