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

Commit 0305f730 authored by Rachel Lee's avatar Rachel Lee Committed by Automerger Merge Worker
Browse files

Merge "Use ScopedLocalRef in DisplayEventReceiver JNI" into udc-dev am: 102033d0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21968196



Change-Id: I995dbcc9f2669e0a1c0670c075ca54e99dd4277f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents db29f989 102033d0

core/jni/android_view_DisplayEventReceiver.cpp

+12 −8
Original line number Diff line number Diff line
@@ -169,21 +169,25 @@ void NativeDisplayEventReceiver::dispatchVsync(nsecs_t timestamp, PhysicalDispla 
                          gDisplayEventReceiverClassInfo.vsyncEventDataClassInfo.frameInterval,

                          vsyncEventData.frameInterval);



        jobjectArray frameTimelinesObj = reinterpret_cast<jobjectArray>(

        ScopedLocalRef<jobjectArray>

                frameTimelinesObj(env,

                                  reinterpret_cast<jobjectArray>(

                                          env->GetObjectField(vsyncEventDataObj.get(),

                                    gDisplayEventReceiverClassInfo.vsyncEventDataClassInfo

                                            .frameTimelines));

                                                              gDisplayEventReceiverClassInfo

                                                                      .vsyncEventDataClassInfo

                                                                      .frameTimelines)));

        for (int i = 0; i < VsyncEventData::kFrameTimelinesLength; i++) {

            VsyncEventData::FrameTimeline& frameTimeline = vsyncEventData.frameTimelines[i];

            jobject frameTimelineObj = env->GetObjectArrayElement(frameTimelinesObj, i);

            env->SetLongField(frameTimelineObj,

            ScopedLocalRef<jobject>

                    frameTimelineObj(env, env->GetObjectArrayElement(frameTimelinesObj.get(), i));

            env->SetLongField(frameTimelineObj.get(),

                              gDisplayEventReceiverClassInfo.frameTimelineClassInfo.vsyncId,

                              frameTimeline.vsyncId);

            env->SetLongField(frameTimelineObj,

            env->SetLongField(frameTimelineObj.get(),

                              gDisplayEventReceiverClassInfo.frameTimelineClassInfo

                                      .expectedPresentationTime,

                              frameTimeline.expectedPresentationTime);

            env->SetLongField(frameTimelineObj,

            env->SetLongField(frameTimelineObj.get(),

                              gDisplayEventReceiverClassInfo.frameTimelineClassInfo.deadline,

                              frameTimeline.deadlineTimestamp);

        }