Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: d145cab07b

Change-Id: I5162438a7951512a179e15e7de4c20ec5aaecd97
This commit is contained in:
Andreas Gampe
2017-10-09 23:45:11 +00:00
committed by android-build-merger
parent 15e12ff1fa d145cab07b
commit 25c2a82bed
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/jni/android_app_admin_SecurityLog.cpp
View File

@@ -161,6 +161,9 @@ static void readEvents(JNIEnv* env, int loggerMode, jlong startTime, jobject out
env->CallBooleanMethod(out, gCollectionAddID, event); env->CallBooleanMethod(out, gCollectionAddID, event);
env->DeleteLocalRef(event); env->DeleteLocalRef(event);
env->DeleteLocalRef(array); env->DeleteLocalRef(array);
if (env->ExceptionCheck() == JNI_TRUE) {
break;
}
} }
android_logger_list_close(logger_list); android_logger_list_close(logger_list);

3
core/jni/android_util_EventLog.cpp
View File

@@ -215,6 +215,9 @@ static void readEvents(JNIEnv* env, int loggerMode, jintArray tags, jlong startT
env->CallBooleanMethod(out, gCollectionAddID, event); env->CallBooleanMethod(out, gCollectionAddID, event);
env->DeleteLocalRef(event); env->DeleteLocalRef(event);
env->DeleteLocalRef(array); env->DeleteLocalRef(array);
if (env->ExceptionCheck() == JNI_TRUE) {
break;
}
} }
} }