Merge "EventLog: Check for exception after add()" am: c30a6ac2f1 am: f8fa4b8352

am: d145cab07b

Change-Id: I5162438a7951512a179e15e7de4c20ec5aaecd97

2 files changed, 6 insertions, 0 deletions

diff --git a/core/jni/android_app_admin_SecurityLog.cpp b/core/jni/android_app_admin_SecurityLog.cpp
index 9a4c37167e3b..be3eef75fe71 100644
--- a/core/jni/android_app_admin_SecurityLog.cpp
+++ b/core/jni/android_app_admin_SecurityLog.cpp
@@ -161,6 +161,9 @@ static void readEvents(JNIEnv* env, int loggerMode, jlong startTime, jobject out
         env->CallBooleanMethod(out, gCollectionAddID, event);
         env->DeleteLocalRef(event);
         env->DeleteLocalRef(array);
+        if (env->ExceptionCheck() == JNI_TRUE) {
+            break;
+        }
     }
 
     android_logger_list_close(logger_list);
diff --git a/core/jni/android_util_EventLog.cpp b/core/jni/android_util_EventLog.cpp
index 9fd7c4041058..76ce30779ced 100644
--- a/core/jni/android_util_EventLog.cpp
+++ b/core/jni/android_util_EventLog.cpp
@@ -215,6 +215,9 @@ static void readEvents(JNIEnv* env, int loggerMode, jintArray tags, jlong startT
             env->CallBooleanMethod(out, gCollectionAddID, event);
             env->DeleteLocalRef(event);
             env->DeleteLocalRef(array);
+            if (env->ExceptionCheck() == JNI_TRUE) {
+                break;
+            }
         }
     }