Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d909c7d1 authored by Martijn Coenen's avatar Martijn Coenen Committed by android-build-merger
Browse files

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

Merge "BinderProxy dump: distinguish between empty descriptor and dead remote." am: 2e9e624c am: cbd295ea
am: 23920a0d

Change-Id: I383846f94ac467305710ec45902d601dd0379e96
parents 773136a1 23920a0d

core/java/android/os/BinderProxy.java

+3 −0
Original line number Diff line number Diff line
@@ -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>";

                            }