From 262bfb126940daf126599d6a93f25e2c8fddeb3c Mon Sep 17 00:00:00 2001
From: Siim Sammul <siims@google.com>
Date: Tue, 6 Sep 2022 16:51:51 +0100
Subject: [PATCH] Also reset the dropbox rate limiter in BootReceiver in
 addition to ActivityManagerService.

Test: atest ErrorsTest
Bug: 242671309
Change-Id: I5ee6d56281d579edf76c73acf81237f42939ead7
---
 services/core/java/com/android/server/BootReceiver.java   | 8 ++++++++
 .../com/android/server/am/ActivityManagerService.java     | 4 +++-
 .../java/com/android/server/am/DropboxRateLimiter.java    | 2 +-
 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 b33d84c0f2750..c713a4144cece 100644
--- a/services/core/java/com/android/server/BootReceiver.java
+++ b/services/core/java/com/android/server/BootReceiver.java
@@ -313,6 +313,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.
      *
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 2cf24fa9df1fe..e14e1f67fb74f 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;
@@ -17903,10 +17904,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 6087f76687bf6..e5975c3ed73da 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();
         }