| commit | 2563fe45195305565668d718a210ef51a0770b1c | [log] [tgz] |
|---|---|---|
| author | Garfield Tan <xutan@google.com> | Tue Oct 13 04:13:40 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 13 04:13:40 2020 +0000 |
| tree | aecfc125795e7251cba43b239ff6e24b2bb811aa | |
| parent | fe2cbc4d03f0b21e2772ad1620463e505d74298f [diff] | |
| parent | 8137343387a6a55ad44122eddf1ac65fdedb5414 [diff] |
Allow null exception reporter. am: 8590c7925f am: 71a2fd0f21 am: 8137343387 Original change: https://android-review.googlesource.com/c/platform/external/libchrome/+/1454675 Change-Id: I91a1bfa4a00e9b811015324b78899974d69fa824
diff --git a/base/android/java_exception_reporter.cc b/base/android/java_exception_reporter.cc index 96eb38e..be3e703 100644 --- a/base/android/java_exception_reporter.cc +++ b/base/android/java_exception_reporter.cc
@@ -38,8 +38,11 @@ } void SetJavaException(const char* exception) { - DCHECK(g_java_exception_callback); - g_java_exception_callback(exception); + // No need to print exception because they are already logged via + // env->ExceptionDescribe() within jni_android.cc. + if (g_java_exception_callback) { + g_java_exception_callback(exception); + } } void JNI_JavaExceptionReporter_ReportJavaException(