From ac25f982dadc7f20774c4437c98a2314db4f9b42 Mon Sep 17 00:00:00 2001
From: Siim Sammul <siims@google.com>
Date: Thu, 1 Dec 2022 13:04:55 +0000
Subject: [PATCH] Change DropboxRateLimiter to rate limit proto tombstones and
 regular tombstones separately.

Bug: 255249203
Test: atest ErrorsTest

Change-Id: I258657233ed643615cdd4b7ebdcf6447b1a964af
---
 services/core/java/com/android/server/BootReceiver.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/services/core/java/com/android/server/BootReceiver.java b/services/core/java/com/android/server/BootReceiver.java
index 84c033cbdf0ed..572e9c2a5d829 100644
--- a/services/core/java/com/android/server/BootReceiver.java
+++ b/services/core/java/com/android/server/BootReceiver.java
@@ -337,12 +337,10 @@ public class BootReceiver extends BroadcastReceiver {
             return;
         }
 
-        // Check if we should rate limit and abort early if needed. Do this for both proto and
-        // non-proto tombstones, even though proto tombstones do not support including the counter
-        // of events dropped since rate limiting activated yet.
+        // Check if we should rate limit and abort early if needed.
         DropboxRateLimiter.RateLimitResult rateLimitResult =
                 sDropboxRateLimiter.shouldRateLimit(
-                       proto ? TAG_TOMBSTONE_PROTO : TAG_TOMBSTONE, processName);
+                        proto ? TAG_TOMBSTONE_PROTO_WITH_HEADERS : TAG_TOMBSTONE, processName);
         if (rateLimitResult.shouldRateLimit()) return;
 
         HashMap<String, Long> timestamps = readTimestamps();