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

Commit abe5a001 authored by Rachel Lee's avatar Rachel Lee Committed by Android (Google) Code Review
Browse files

Merge changes from topic "scdocs" 

* changes:
  Use AVsyncId typedef in hwui.
  Use AVsyncId typedef.
parents 7656a21d 5ad064f0

libs/hwui/renderthread/RenderThread.cpp

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ void RenderThread::extendedFrameCallback(const AChoreographerFrameCallbackData* 
    RenderThread* rt = reinterpret_cast<RenderThread*>(data);

    size_t preferredFrameTimelineIndex =

            AChoreographerFrameCallbackData_getPreferredFrameTimelineIndex(cbData);

    int64_t vsyncId = AChoreographerFrameCallbackData_getFrameTimelineVsyncId(

    AVsyncId vsyncId = AChoreographerFrameCallbackData_getFrameTimelineVsyncId(

            cbData, preferredFrameTimelineIndex);

    int64_t frameDeadline = AChoreographerFrameCallbackData_getFrameTimelineDeadlineNanos(

            cbData, preferredFrameTimelineIndex);

native/android/choreographer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ size_t AChoreographerFrameCallbackData_getPreferredFrameTimelineIndex( 
        const AChoreographerFrameCallbackData* data) {

    return AChoreographerFrameCallbackData_routeGetPreferredFrameTimelineIndex(data);

}

int64_t AChoreographerFrameCallbackData_getFrameTimelineVsyncId(

AVsyncId AChoreographerFrameCallbackData_getFrameTimelineVsyncId(

        const AChoreographerFrameCallbackData* data, size_t index) {

    return AChoreographerFrameCallbackData_routeGetFrameTimelineVsyncId(data, index);

}

native/android/surface_control.cpp

+1 −1
Original line number Diff line number Diff line
@@ -661,7 +661,7 @@ void ASurfaceTransaction_setOnCommit(ASurfaceTransaction* aSurfaceTransaction, v 
}



void ASurfaceTransaction_setFrameTimeline(ASurfaceTransaction* aSurfaceTransaction,

                                          int64_t vsyncId) {

                                          AVsyncId vsyncId) {

    CHECK_NOT_NULL(aSurfaceTransaction);

    // TODO(b/210043506): Get start time from platform.

    ASurfaceTransaction_to_Transaction(aSurfaceTransaction)