diff options
| author | Garfield Tan <xutan@google.com> | 2020-10-13 04:40:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-13 04:40:30 +0000 |
| commit | 1344ab344eb29d72171e6f3034f9bad19b2df655 (patch) | |
| tree | aecfc125795e7251cba43b239ff6e24b2bb811aa | |
| parent | 3fa43c90946f50ed8f37d2d47c14a1d44d5aada8 (diff) | |
| parent | 2563fe45195305565668d718a210ef51a0770b1c (diff) | |
| download | libchrome-1344ab344eb29d72171e6f3034f9bad19b2df655.tar.gz | |
Allow null exception reporter. am: 8590c7925f am: 71a2fd0f21 am: 8137343387 am: 2563fe4519
Original change: https://android-review.googlesource.com/c/platform/external/libchrome/+/1454675
Change-Id: Ief424ab1250a8c491fb265cb23a5727284beb9f7
| -rw-r--r-- | base/android/java_exception_reporter.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/base/android/java_exception_reporter.cc b/base/android/java_exception_reporter.cc index 96eb38e581..be3e7039ac 100644 --- a/base/android/java_exception_reporter.cc +++ b/base/android/java_exception_reporter.cc @@ -38,8 +38,11 @@ void SetJavaExceptionCallback(void (*callback)(const char*)) { } 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( |