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

Commit 922a804f authored by Huihong Luo's avatar Huihong Luo Committed by Android (Google) Code Review
Browse files

Merge "Sync with FrameTimelineInfo aidl migration"

parents ee4aca31 4fed9b45

core/jni/android_view_SurfaceControl.cpp

+4 −2
Original line number Diff line number Diff line
@@ -1950,8 +1950,10 @@ static void nativeSetFrameTimelineVsync(JNIEnv* env, jclass clazz, jlong transac 
                                        jlong frameTimelineVsyncId) {

    auto transaction = reinterpret_cast<SurfaceComposerClient::Transaction*>(transactionObj);



    transaction->setFrameTimelineInfo(

            {frameTimelineVsyncId, android::os::IInputConstants::INVALID_INPUT_EVENT_ID});

    FrameTimelineInfo ftInfo;

    ftInfo.vsyncId = frameTimelineVsyncId;

    ftInfo.inputEventId = android::os::IInputConstants::INVALID_INPUT_EVENT_ID;

    transaction->setFrameTimelineInfo(ftInfo);

}



static void nativeAddTransactionCommittedListener(JNIEnv* env, jclass clazz, jlong transactionObj,

native/android/surface_control.cpp

+4 −2
Original line number Diff line number Diff line
@@ -669,6 +669,8 @@ void ASurfaceTransaction_setFrameTimeline(ASurfaceTransaction* aSurfaceTransacti 
                                          AVsyncId vsyncId) {

    CHECK_NOT_NULL(aSurfaceTransaction);

    const auto startTime = AChoreographer_getStartTimeNanosForVsyncId(vsyncId);

    ASurfaceTransaction_to_Transaction(aSurfaceTransaction)

            ->setFrameTimelineInfo({.vsyncId = vsyncId, .startTimeNanos = startTime});

    FrameTimelineInfo ftInfo;

    ftInfo.vsyncId = vsyncId;

    ftInfo.startTimeNanos = startTime;

    ASurfaceTransaction_to_Transaction(aSurfaceTransaction)->setFrameTimelineInfo(ftInfo);

}