From ffaac1c2d38fde3c8e0503c1c5cc2fc3eedad78a Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Fri, 12 Mar 2021 21:16:07 +0000
Subject: [PATCH] Binder: disambiguate unlinkToDeath error

BpBinder may return OK, DEAD_OBJECT, or NAME_NOT_FOUND for this
operation, but BBinder returns INVALID_OPERATION, and subclasses may
return other errors. In at least one bug, the resolution of this
ambiguity would help direct debugging.

Bug: 180891878
Test: N/A

Change-Id: I109a09788d3075e7c594445a6f3649ade109b5c2
---
 core/jni/android_util_Binder.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/jni/android_util_Binder.cpp b/core/jni/android_util_Binder.cpp
index f71b42c4793f4..249950419441b 100644
--- a/core/jni/android_util_Binder.cpp
+++ b/core/jni/android_util_Binder.cpp
@@ -1516,7 +1516,9 @@ static jboolean android_os_BinderProxy_unlinkToDeath(JNIEnv* env, jobject obj,
             res = JNI_TRUE;
         } else {
             jniThrowException(env, "java/util/NoSuchElementException",
-                              "Death link does not exist");
+                              base::StringPrintf("Death link does not exist (%s)",
+                                                 statusToString(err).c_str())
+                                      .c_str());
         }
     }