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

Handle null JNI object in DisplayEventReceiver

Browse Source 
Bug: 270143331
Test: atest DisplayEventReceiverTest
Test: atest EventThreadTest
Change-Id: I478470b60248e7afef067f9f123d643d4ad3c000
This commit is contained in:
Rachel Lee
2023-03-13 20:01:18 -07:00
parent 2e49589c0c
commit 6a9b0a9fa8
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/jni/android_view_DisplayEventReceiver.cpp
View File

@@ -18,19 +18,17 @@
//#define LOG_NDEBUG 0
#include <nativehelper/JNIHelp.h>
#include <inttypes.h>
#include <android_runtime/AndroidRuntime.h>
#include <android_runtime/Log.h>
#include <gui/DisplayEventDispatcher.h>
#include <inttypes.h>
#include <nativehelper/JNIHelp.h>
#include <nativehelper/ScopedLocalRef.h>
#include <utils/Log.h>
#include <utils/Looper.h>
#include <utils/threads.h>
#include "android_os_MessageQueue.h"
#include <nativehelper/ScopedLocalRef.h>
#include "core_jni_helpers.h"
namespace android {
@@ -133,6 +131,12 @@ static jobject createJavaVsyncEventData(JNIEnv* env, VsyncEventData vsyncEventDa
gDisplayEventReceiverClassInfo
.frameTimelineClassInfo.clazz,
/*initial element*/ NULL));
if (!frameTimelineObjs.get() || env->ExceptionCheck()) {
ALOGW("%s: Failed to create FrameTimeline array", __func__);
LOGW_EX(env);
env->ExceptionClear();
return NULL;
}
for (int i = 0; i < VsyncEventData::kFrameTimelinesLength; i++) {
VsyncEventData::FrameTimeline frameTimeline = vsyncEventData.frameTimelines[i];
ScopedLocalRef<jobject>
@@ -144,6 +148,12 @@ static jobject createJavaVsyncEventData(JNIEnv* env, VsyncEventData vsyncEventDa
frameTimeline.vsyncId,
frameTimeline.expectedPresentationTime,
frameTimeline.deadlineTimestamp));
if (!frameTimelineObj.get() || env->ExceptionCheck()) {
ALOGW("%s: Failed to create FrameTimeline object", __func__);
LOGW_EX(env);
env->ExceptionClear();
return NULL;
}
env->SetObjectArrayElement(frameTimelineObjs.get(), i, frameTimelineObj.get());
}
return env->NewObject(gDisplayEventReceiverClassInfo.vsyncEventDataClassInfo.clazz,