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

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

Merge changes from topic "achoreonanos" 

* changes:
  Update hwui with renamed AChoreographer method.
  Update libandroid renamed AChoreographer methods.
parents 24f7505d 3712a2a7

libs/hwui/renderthread/RenderThread.cpp

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ void RenderThread::extendedFrameCallback(const AChoreographerFrameCallbackData* 
            AChoreographerFrameCallbackData_getPreferredFrameTimelineIndex(cbData);

    int64_t vsyncId = AChoreographerFrameCallbackData_getFrameTimelineVsyncId(

            cbData, preferredFrameTimelineIndex);

    int64_t frameDeadline = AChoreographerFrameCallbackData_getFrameTimelineDeadline(

    int64_t frameDeadline = AChoreographerFrameCallbackData_getFrameTimelineDeadlineNanos(

            cbData, preferredFrameTimelineIndex);

    int64_t frameTimeNanos = AChoreographerFrameCallbackData_getFrameTimeNanos(cbData);

    // TODO(b/193273294): Remove when shared memory in use w/ expected present time always current.

native/android/choreographer.cpp

+5 −4
Original line number Diff line number Diff line
@@ -71,11 +71,12 @@ int64_t AChoreographerFrameCallbackData_getFrameTimelineVsyncId( 
        const AChoreographerFrameCallbackData* data, size_t index) {

    return AChoreographerFrameCallbackData_routeGetFrameTimelineVsyncId(data, index);

}

int64_t AChoreographerFrameCallbackData_getFrameTimelineExpectedPresentTime(

int64_t AChoreographerFrameCallbackData_getFrameTimelineExpectedPresentTimeNanos(

        const AChoreographerFrameCallbackData* data, size_t index) {

    return AChoreographerFrameCallbackData_routeGetFrameTimelineExpectedPresentTime(data, index);

    return AChoreographerFrameCallbackData_routeGetFrameTimelineExpectedPresentTimeNanos(data,

                                                                                         index);

}

int64_t AChoreographerFrameCallbackData_getFrameTimelineDeadline(

int64_t AChoreographerFrameCallbackData_getFrameTimelineDeadlineNanos(

        const AChoreographerFrameCallbackData* data, size_t index) {

    return AChoreographerFrameCallbackData_routeGetFrameTimelineDeadline(data, index);

    return AChoreographerFrameCallbackData_routeGetFrameTimelineDeadlineNanos(data, index);

}

native/android/libandroid.map.txt

+2 −2
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ LIBANDROID { 
    AChoreographerFrameCallbackData_getFrameTimelinesLength;  # introduced=33

    AChoreographerFrameCallbackData_getPreferredFrameTimelineIndex;  # introduced=33

    AChoreographerFrameCallbackData_getFrameTimelineVsyncId;  # introduced=33

    AChoreographerFrameCallbackData_getFrameTimelineExpectedPresentTime;  # introduced=33

    AChoreographerFrameCallbackData_getFrameTimelineDeadline;  # introduced=33

    AChoreographerFrameCallbackData_getFrameTimelineExpectedPresentTimeNanos;  # introduced=33

    AChoreographerFrameCallbackData_getFrameTimelineDeadlineNanos;  # introduced=33

    AConfiguration_copy;

    AConfiguration_delete;

    AConfiguration_diff;