diff options
| author | Martijn Coenen <maco@google.com> | 2018-08-10 01:48:55 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-08-10 01:48:55 -0700 |
| commit | b04b59beab4dfdffe4a910a53a3ee902298d03e8 (patch) | |
| tree | d44bd09e3dc838795a340eeb9ca75a79a1ab1882 /core/java | |
| parent | 9a8fce52243e9f1ccbe8f7b85f5204b96fde90ad (diff) | |
| parent | d909c7d1d0f0983d6a2ca01db411a2e7a74aa976 (diff) | |
Merge "BinderProxy dump: distinguish between empty descriptor and dead remote." am: 2e9e624c76 am: cbd295ea50 am: 23920a0da9
am: d909c7d1d0
Change-Id: Ia52ee5d128a3269c5ac34478ade5cc768cc43bb5
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/os/BinderProxy.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/os/BinderProxy.java b/core/java/android/os/BinderProxy.java index 5752b6f54ce5..591370ff728b 100644 --- a/core/java/android/os/BinderProxy.java +++ b/core/java/android/os/BinderProxy.java @@ -241,6 +241,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>"; } |