diff options
3 files changed, 12 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/BootReceiver.java b/services/core/java/com/android/server/BootReceiver.java index add67d0dca86..85f1e0a36ae9 100644 --- a/services/core/java/com/android/server/BootReceiver.java +++ b/services/core/java/com/android/server/BootReceiver.java @@ -314,6 +314,14 @@ public class BootReceiver extends BroadcastReceiver { private static final DropboxRateLimiter sDropboxRateLimiter = new DropboxRateLimiter(); /** + * Reset the dropbox rate limiter. + */ + @VisibleForTesting + public static void resetDropboxRateLimiter() { + sDropboxRateLimiter.reset(); + } + + /** * Add a tombstone to the DropBox. * * @param ctx Context diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index bc065d17e8aa..91d813803ac4 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -376,6 +376,7 @@ import com.android.internal.util.function.QuintFunction; import com.android.internal.util.function.TriFunction; import com.android.internal.util.function.UndecFunction; import com.android.server.AlarmManagerInternal; +import com.android.server.BootReceiver; import com.android.server.DeviceIdleInternal; import com.android.server.DisplayThread; import com.android.server.IntentResolver; @@ -17794,10 +17795,11 @@ public class ActivityManagerService extends IActivityManager.Stub } /** - * Reset the dropbox rate limiter + * Reset the dropbox rate limiter here and in BootReceiver */ void resetDropboxRateLimiter() { mDropboxRateLimiter.reset(); + BootReceiver.resetDropboxRateLimiter(); } /** diff --git a/services/core/java/com/android/server/am/DropboxRateLimiter.java b/services/core/java/com/android/server/am/DropboxRateLimiter.java index 6087f76687bf..e5975c3ed73d 100644 --- a/services/core/java/com/android/server/am/DropboxRateLimiter.java +++ b/services/core/java/com/android/server/am/DropboxRateLimiter.java @@ -108,7 +108,7 @@ public class DropboxRateLimiter { } /** Resets the rate limiter memory. */ - void reset() { + public void reset() { synchronized (mErrorClusterRecords) { mErrorClusterRecords.clear(); } |