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

Commit 47d387bc authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [7796490, 7796819, 7796821, 7796671, 7796765, 7796766,... 

Merge cherrypicks of [7796490, 7796819, 7796821, 7796671, 7796765, 7796766, 7796673] into qt-c2f2-release

Change-Id: I38ab72745f0c1e1530d831e67ec4bf5b2ac48679
parents 84e38eaa 013be5fa

libs/gui/BufferQueueProducer.cpp

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

        item.mFence = acquireFence;

        item.mFenceTime = acquireFenceTime;

        item.mFenceTime = acquireFenceTime;

        item.mIsDroppable = mCore->mAsyncMode ||

        item.mIsDroppable = mCore->mAsyncMode ||

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

                (mConsumerIsSurfaceFlinger && mCore->mQueueBufferCanDrop) ||

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

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

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

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

        item.mSurfaceDamage = surfaceDamage;

        item.mSurfaceDamage = surfaceDamage;

libs/gui/include/gui/BufferQueueCore.h

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




    // mLegacyBufferDrop indicates whether mQueueBufferCanDrop is in effect.

    // mLegacyBufferDrop indicates whether mQueueBufferCanDrop is in effect.

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

    // 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;

    bool mLegacyBufferDrop;





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

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