diff options
| -rw-r--r-- | services/core/java/com/android/server/am/DropboxRateLimiter.java | 2 | ||||
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/am/DropboxRateLimiterTest.java | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/services/core/java/com/android/server/am/DropboxRateLimiter.java b/services/core/java/com/android/server/am/DropboxRateLimiter.java index 727d4df96c47..b5c7215df899 100644 --- a/services/core/java/com/android/server/am/DropboxRateLimiter.java +++ b/services/core/java/com/android/server/am/DropboxRateLimiter.java @@ -40,7 +40,7 @@ public class DropboxRateLimiter { // If a process is rate limited twice in a row we consider it crash-looping and rate limit it // more aggressively. private static final int STRICT_RATE_LIMIT_ALLOWED_ENTRIES = 1; - private static final long STRICT_RATE_LIMIT_BUFFER_DURATION = 60 * DateUtils.MINUTE_IN_MILLIS; + private static final long STRICT_RATE_LIMIT_BUFFER_DURATION = 20 * DateUtils.MINUTE_IN_MILLIS; @GuardedBy("mErrorClusterRecords") private final ArrayMap<String, ErrorRecord> mErrorClusterRecords = new ArrayMap<>(); diff --git a/services/tests/servicestests/src/com/android/server/am/DropboxRateLimiterTest.java b/services/tests/servicestests/src/com/android/server/am/DropboxRateLimiterTest.java index 01563e27a787..36a565e58f56 100644 --- a/services/tests/servicestests/src/com/android/server/am/DropboxRateLimiterTest.java +++ b/services/tests/servicestests/src/com/android/server/am/DropboxRateLimiterTest.java @@ -140,19 +140,19 @@ public class DropboxRateLimiterTest { // Repeated crashes after the last reset being rate limited should be restricted faster. assertTrue(mRateLimiter.shouldRateLimit("tag", "process").shouldRateLimit()); - // We now need to wait 61 minutes for the buffer should be empty again. - mClock.setOffsetMillis(83 * 60 * 1000); + // We now need to wait 21 minutes for the buffer should be empty again. + mClock.setOffsetMillis(43 * 60 * 1000); assertFalse(mRateLimiter.shouldRateLimit("tag", "process").shouldRateLimit()); - // After yet another 61 minutes, this time without triggering rate limiting, the strict + // After yet another 21 minutes, this time without triggering rate limiting, the strict // limiting should be turnd off. - mClock.setOffsetMillis(144 * 60 * 1000); + mClock.setOffsetMillis(64 * 60 * 1000); assertFalse(mRateLimiter.shouldRateLimit("tag", "process").shouldRateLimit()); assertFalse(mRateLimiter.shouldRateLimit("tag", "process").shouldRateLimit()); // As rate limiting was not triggered in the last reset, after another 11 minutes the // buffer should still act as normal. - mClock.setOffsetMillis(155 * 60 * 1000); + mClock.setOffsetMillis(75 * 60 * 1000); // The first 6 entries should not be rate limited. assertFalse(mRateLimiter.shouldRateLimit("tag", "process").shouldRateLimit()); assertFalse(mRateLimiter.shouldRateLimit("tag", "process").shouldRateLimit()); |