drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Siim Sammul 2022-09-08 18:51:41 +00:00 committed by Gerrit Code Review
commit a12efe5b68
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/BootReceiver.java
View File

@ -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.
*

4
services/core/java/com/android/server/am/ActivityManagerService.java
View File

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

2
services/core/java/com/android/server/am/DropboxRateLimiter.java
View File

@ -108,7 +108,7 @@ public class DropboxRateLimiter {
}
/** Resets the rate limiter memory. */
void reset() {
public void reset() {
synchronized (mErrorClusterRecords) {
mErrorClusterRecords.clear();
}