Move proxy debug info dumping back to Java.

This had to be called from native because serialization
was done from native, but now that serialization is in Java
we can move this back to a more logical place.

Also, this allows us to dump the per-UID proxy counts in
this situation again.

Bug: 109888955
Test: sailfish builds, proxy debug info shown on hitting limits
Change-Id: I4e06b3f93e30ed1c7868ec9e018709a7e796e441

1 files changed, 2 insertions, 5 deletions

diff --git a/core/java/android/os/BinderProxy.java b/core/java/android/os/BinderProxy.java
index 5e09cc15d982..5752b6f54ce5 100644
--- a/core/java/android/os/BinderProxy.java
+++ b/core/java/android/os/BinderProxy.java
@@ -351,15 +351,12 @@ public final class BinderProxy implements IBinder {
      *
      * @hide
      */
-    private static void dumpProxyDebugInfo() {
+    public static void dumpProxyDebugInfo() {
         if (Build.IS_DEBUGGABLE) {
             synchronized (sProxyMap) {
                 sProxyMap.dumpProxyInterfaceCounts();
+                sProxyMap.dumpPerUidProxyCounts();
             }
-            // Note that we don't call dumpPerUidProxyCounts(); this is because this
-            // method may be called as part of the uid limit being hit, and calling
-            // back into the UID tracking code would cause us to try to acquire a mutex
-            // that is held during that callback.
         }
     }