diff --git a/core/java/android/os/BinderProxy.java b/core/java/android/os/BinderProxy.java index 5752b6f54ce50..591370ff728bf 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 = ""; + } } catch (Throwable t) { key = ""; }