Merge "Binder: disambiguate unlinkToDeath error" am: 4600169731 am: 04b996abf6 am: 8979d72394

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1634659

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0ef7cc1332f57c437781d71f825f750fc574a3d4

1 files changed, 3 insertions, 1 deletions

diff --git a/core/jni/android_util_Binder.cpp b/core/jni/android_util_Binder.cpp
index f7b3f309ed12..2e4be145d54d 100644
--- a/core/jni/android_util_Binder.cpp
+++ b/core/jni/android_util_Binder.cpp
@@ -1509,7 +1509,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());
         }
     }