Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 262bfb12 authored by Siim Sammul's avatar Siim Sammul
Browse files

Also reset the dropbox rate limiter in BootReceiver in addition to 

ActivityManagerService.

Test: atest ErrorsTest
Bug: 242671309
Change-Id: I5ee6d56281d579edf76c73acf81237f42939ead7
parent 8cee5077

services/core/java/com/android/server/BootReceiver.java

+8 −0
Original line number Diff line number Diff line
@@ -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.

     *

services/core/java/com/android/server/am/ActivityManagerService.java

+3 −1
Original line number Diff line number Diff line
@@ -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();















    }





























    /**

























services/core/java/com/android/server/am/DropboxRateLimiter.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -108,7 +108,7 @@ public class DropboxRateLimiter {













    }































    /** Resets the rate limiter memory. */













    void reset() {













    public void reset() {















        synchronized (mErrorClusterRecords) {















            mErrorClusterRecords.clear();















        }