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

am: 23920a0da9

Change-Id: I383846f94ac467305710ec45902d601dd0379e96

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>";
                             }