commit bc7a4d0b717a90b86b9ba86ea276da9c0f2b4b93
author Li Li <dualli@google.com> Tue Apr 30 05:29:37 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 30 05:29:37 2024 +0000
tree f3c2b2a4474a8ada023cd02c89908552bd11724d
parent fe7a7224d53b9261a6c9081fa1ca78714c539e27
parent 05387b6d6a4db7cf227f0588234a7684befb94c1

Merge "Prevent frozenBinderTransactionDetected() storm" into main

core/java/android/app/ActivityThread.java

diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index bc66127..68cc17b 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -353,6 +353,9 @@
 
     private static final String DEFAULT_FULL_BACKUP_AGENT = "android.app.backup.FullBackupAgent";
 
+    private static final long BINDER_CALLBACK_THROTTLE = 10_100L;
+    private long mBinderCallbackLast = -1;
+
     /**
      * Denotes the sequence number of the process state change for which the main thread needs
      * to block until the network rules are updated for it.
@@ -7525,6 +7528,12 @@
         Binder.setTransactionCallback(new IBinderCallback() {
             @Override
             public void onTransactionError(int pid, int code, int flags, int err) {
+                final long now = SystemClock.uptimeMillis();
+                if (now < mBinderCallbackLast + BINDER_CALLBACK_THROTTLE) {
+                    Slog.d(TAG, "Too many transaction errors, throttling freezer binder callback.");
+                    return;
+                }
+                mBinderCallbackLast = now;
                 try {
                     mgr.frozenBinderTransactionDetected(pid, code, flags, err);
                 } catch (RemoteException ex) {