summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGarfield Tan <xutan@google.com>2020-10-13 03:43:29 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-10-13 03:43:29 +0000
commit8137343387a6a55ad44122eddf1ac65fdedb5414 (patch)
treeaecfc125795e7251cba43b239ff6e24b2bb811aa
parentfbf5d9fb18a0d7b3290e0b43e1a6d2813b52307b (diff)
parent71a2fd0f21dd0b7ffbc0a745307961a9c6020fe6 (diff)
downloadlibchrome-8137343387a6a55ad44122eddf1ac65fdedb5414.tar.gz
Allow null exception reporter. am: 8590c7925f am: 71a2fd0f21
Original change: https://android-review.googlesource.com/c/platform/external/libchrome/+/1454675 Change-Id: Iecaa5530a8d932022f10401a7abebfa75a98576b
-rw-r--r--base/android/java_exception_reporter.cc7
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(