commit 2e9e624c76f5710e24b23d4378f22086ce0a8610
author Martijn Coenen <maco@google.com> Fri Aug 10 07:01:37 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 10 07:01:37 2018 +0000
tree 42bc7fb7605664cb7eebc59ccc87b1beadd457ac
parent 01f0135ba4ba92fb07c8b65358f8cff32d7f8587
parent 3796b0d6a647022ee4c2a9458392d922411c8b53

Merge "BinderProxy dump: distinguish between empty descriptor and dead remote."

core/java/android/os/BinderProxy.java

diff --git a/core/java/android/os/BinderProxy.java b/core/java/android/os/BinderProxy.java
index dc09c51..e492f88 100644
--- a/core/java/android/os/BinderProxy.java
+++ b/core/java/android/os/BinderProxy.java
@@ -240,6 +240,9 @@
                         } else {
                             try {
                                 key = bp.getInterfaceDescriptor();
+                                if ((key == null || key.isEmpty()) && !bp.isBinderAlive()) {
+                                    key = "<proxy to dead node>";
+                                }
                             } catch (Throwable t) {
                                 key = "<exception during getDescriptor>";
                             }