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

Commit 8433cb21 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [7796491, 7796820, 7796672, 7796356, 7796357] into qt-release 

Change-Id: Iea4b2531184fdac3b3875fbc686c876800e59666
parents 3a92022c c1b8077c

libs/gui/BufferQueueProducer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -886,7 +886,7 @@ status_t BufferQueueProducer::queueBuffer(int slot, 
        item.mFence = acquireFence;

        item.mFenceTime = acquireFenceTime;

        item.mIsDroppable = mCore->mAsyncMode ||

                (!mCore->mLegacyBufferDrop && mConsumerIsSurfaceFlinger) ||

                (mConsumerIsSurfaceFlinger && mCore->mQueueBufferCanDrop) ||

                (mCore->mLegacyBufferDrop && mCore->mQueueBufferCanDrop) ||

                (mCore->mSharedBufferMode && mCore->mSharedBufferSlot == slot);

        item.mSurfaceDamage = surfaceDamage;

libs/gui/include/gui/BufferQueueCore.h

+2 −1
Original line number Diff line number Diff line
@@ -233,7 +233,8 @@ private: 


    // mLegacyBufferDrop indicates whether mQueueBufferCanDrop is in effect.

    // If this flag is set mQueueBufferCanDrop is working as explained. If not

    // queueBuffer will not drop buffers unless consumer is SurfaceFlinger.

    // queueBuffer will not drop buffers unless consumer is SurfaceFlinger and

    // mQueueBufferCanDrop is set.

    bool mLegacyBufferDrop;



    // mDefaultBufferFormat can be set so it will override the buffer format