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

Commit d9ba9707 authored by Andy McFadden's avatar Andy McFadden Committed by Android (Google) Code Review
Browse files

Merge "Roll back recent change"

parents c1c39f88 4b49e083

libs/gui/BufferQueue.cpp

+1 −1
Original line number Diff line number Diff line
@@ -861,7 +861,7 @@ status_t BufferQueue::acquireBuffer(BufferItem *buffer, nsecs_t expectedPresent) 
        //

        // NOTE: code assumes monotonic time values from the system clock are

        // positive.

        while (mQueue.size() > 1) {

        while (false && mQueue.size() > 1) {

            // If entry[1] is timely, drop entry[0] (and repeat).  We apply

            // an additional criteria here: we only drop the earlier buffer if

            // our desiredPresent falls within +/- 1 second of the expected

libs/gui/Surface.cpp

+3 −1
Original line number Diff line number Diff line
@@ -263,7 +263,9 @@ int Surface::queueBuffer(android_native_buffer_t* buffer, int fenceFd) { 
    Mutex::Autolock lock(mMutex);

    int64_t timestamp;

    if (mTimestamp == NATIVE_WINDOW_TIMESTAMP_AUTO) {

        timestamp = 0;

        timestamp = systemTime(SYSTEM_TIME_MONOTONIC);

        ALOGV("Surface::queueBuffer making up timestamp: %.2f ms",

            timestamp / 1000000.f);

    } else {

        timestamp = mTimestamp;

    }