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

am: cbd295ea50

Change-Id: Ib48f3835c5d56589c2c1b25907c71f3aa5bd3731

core/java/android/os/BinderProxy.java

@@ -240,6 +240,9 @@ public final class BinderProxy implements IBinder {
                         } else {
                             try {
                                 key = bp.getInterfaceDescriptor();
+                                if ((key == null || key.isEmpty()) && !bp.isBinderAlive()) {
+                                    key = "<proxy to dead node>";
+                                }
                             } catch (Throwable t) {
                                 key = "<exception during getDescriptor>";
                             }