Restart loop on MRA16G: Abort message:

    'art/runtime/thread.cc:1320] No pending exception
expected: java.lang.ArrayIndexOutOfBoundsException

b/22591534

Change-Id: Ib8380b38fae8c3b0cb1e8980d397c9bfc98c9b81

1 files changed, 5 insertions, 1 deletions

diff --git a/service/jni/jni_helper.cpp b/service/jni/jni_helper.cpp
index e3965137d..93d24146e 100644
--- a/service/jni/jni_helper.cpp
+++ b/service/jni/jni_helper.cpp
@@ -442,6 +442,10 @@ void reportEvent(JNIEnv *env, jclass cls, const char *method, const char *signat
     }
 
     env->CallStaticVoidMethodV(cls, methodID, params);
+    if (env->ExceptionCheck()) {
+        env->ExceptionDescribe();
+        env->ExceptionClear();
+    }
     va_end(params);
 }
 
@@ -459,7 +463,7 @@ jobject createObject(JNIEnv *env, const char *className)
         return NULL;
     }
     jobject obj = env->NewObject(cls, constructor);
-    if (constructor == NULL) {
+    if (obj == NULL) {
         ALOGE("Could not create new object of %s", className);
         return NULL;
     }