Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix JNI error in exception reporting."

Browse Source
This commit is contained in:
Mathieu Chartier
2014-08-06 20:57:39 +00:00
committed by Gerrit Code Review
parent 8b8c718cbb cf6775eece
commit 7782c6b381
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/jni/android_util_Binder.cpp
View File

@@ -179,7 +179,10 @@ static void report_exception(JNIEnv* env, jthrowable excep, const char* msg)
env->ExceptionClear(); env->ExceptionClear();
jstring tagstr = env->NewStringUTF(LOG_TAG); 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)) { if ((tagstr == NULL) || (msgstr == NULL)) {
env->ExceptionClear(); /* assume exception (OOM?) was thrown */ env->ExceptionClear(); /* assume exception (OOM?) was thrown */