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

Commit 021cf13e authored by Mathieu Chartier's avatar Mathieu Chartier Committed by Android Git Automerger
Browse files

am 7782c6b3: Merge "Fix JNI error in exception reporting."

* commit '7782c6b3':
  Fix JNI error in exception reporting.
parents 37651b60 7782c6b3
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -179,7 +179,10 @@ static void report_exception(JNIEnv* env, jthrowable excep, const char* msg)
    env->ExceptionClear();

    jstring tagstr = env->NewStringUTF(LOG_TAG);
    jstring msgstr = env->NewStringUTF(msg);
    jstring msgstr = NULL;
    if (tagstr != NULL) {
        msgstr = env->NewStringUTF(msg);
    }

    if ((tagstr == NULL) || (msgstr == NULL)) {
        env->ExceptionClear();      /* assume exception (OOM?) was thrown */