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

2018-08-10 07:01:37 +00:00
parent 01f0135ba4 3796b0d6a6
commit 2e9e624c76
1 changed files with 3 additions and 0 deletions
--- a/core/java/android/os/BinderProxy.java
+++ b/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>";
                            }