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

am: f8fa4b8352

Change-Id: Ia9af9320a5b73f1062f7fa0f8cd829602bce4113

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);

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;
+            }
         }
     }