commit 25c2a82bed6b32fa2a22129746c48e10a61a20cb
author Andreas Gampe <agampe@google.com> Mon Oct 09 23:45:11 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 09 23:45:11 2017 +0000
tree 9e661752cfce713dcea8bc5471ac6ba84245ec3d
parent 15e12ff1fa5dff0d3ad351d19817d180ea6ff8ef
parent d145cab07bed29a2975e5ffd3244aa909960d49d

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

Change-Id: I5162438a7951512a179e15e7de4c20ec5aaecd97

core/jni/android_app_admin_SecurityLog.cpp

diff --git a/core/jni/android_app_admin_SecurityLog.cpp b/core/jni/android_app_admin_SecurityLog.cpp
index 9a4c371..be3eef7 100644
--- a/core/jni/android_app_admin_SecurityLog.cpp
+++ b/core/jni/android_app_admin_SecurityLog.cpp
@@ -161,6 +161,9 @@
         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

diff --git a/core/jni/android_util_EventLog.cpp b/core/jni/android_util_EventLog.cpp
index 9fd7c40..76ce3077 100644
--- a/core/jni/android_util_EventLog.cpp
+++ b/core/jni/android_util_EventLog.cpp
@@ -215,6 +215,9 @@
             env->CallBooleanMethod(out, gCollectionAddID, event);
             env->DeleteLocalRef(event);
             env->DeleteLocalRef(array);
+            if (env->ExceptionCheck() == JNI_TRUE) {
+                break;
+            }
         }
     }