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

Commit 3dd9282b authored by Siim Sammul's avatar Siim Sammul Committed by Automerger Merge Worker
Browse files

Merge "Also reset the dropbox rate limiter in BootReceiver in addition to... 

Merge "Also reset the dropbox rate limiter in BootReceiver in addition to ActivityManagerService." am: a12efe5b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2210236



Change-Id: I3f9a35cbcb4b5c93c16e9bef04739e5cdbd7ddd4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 262fca25 a12efe5b

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;
@@ -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();















    }





























    /**

























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();















        }