Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8fa4b83 authored by Andreas Gampe's avatar Andreas Gampe Committed by android-build-merger
Browse files

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

am: c30a6ac2

Change-Id: I17768ab21d49afbc943702803293b8cd47804e5c
parents a25528b0 c30a6ac2

core/jni/android_app_admin_SecurityLog.cpp

+3 −0
Original line number Diff line number Diff line
@@ -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

+3 −0
Original line number Diff line number Diff line
@@ -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;

            }

        }

    }