diff --git a/core/java/android/os/BinderProxy.java b/core/java/android/os/BinderProxy.java
index 3d18125f18125..483b549c56373 100644
--- a/core/java/android/os/BinderProxy.java
+++ b/core/java/android/os/BinderProxy.java
@@ -83,7 +83,7 @@ public final class BinderProxy implements IBinder {
          * Debuggable builds will throw an BinderProxyMapSizeException if the number of
          * map entries exceeds:
          */
-        private static final int CRASH_AT_SIZE = 20_000;
+        private static final int CRASH_AT_SIZE = 25_000;
 
         /**
          * We next warn when we exceed this bucket size.