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

Commit c66bf8e6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Binder: disambiguate unlinkToDeath error" am: 46001697 am: 04b996ab... 

Merge "Binder: disambiguate unlinkToDeath error" am: 46001697 am: 04b996ab am: 8979d723 am: a6508610

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ca29cebcba701edc513fc8498e845ee5d990287
parents d36481ab a6508610

core/jni/android_util_Binder.cpp

+3 −1
Original line number Diff line number Diff line
@@ -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());

        }

    }