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

Commit 2d449b5f authored by Ady Abraham's avatar Ady Abraham Committed by Automerger Merge Worker
Browse files

Merge "Fix an arithmetic error when using unsigned" am: 5e053bba am: 43f03d26 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2411296



Change-Id: I4863b69b5946430cc27fbd911fa4409a548f2fb0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3a92433b 43f03d26

libs/gui/BLASTBufferQueue.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -429,8 +429,8 @@ void BLASTBufferQueue::releaseBufferCallbackLocked( 
        mCurrentMaxAcquiredBufferCount = *currentMaxAcquiredBufferCount;

        mCurrentMaxAcquiredBufferCount = *currentMaxAcquiredBufferCount;

    }

    }





    const auto numPendingBuffersToHold =

    const uint32_t numPendingBuffersToHold =

            isEGL ? std::max(0u, mMaxAcquiredBuffers - mCurrentMaxAcquiredBufferCount) : 0;

            isEGL ? std::max(0, mMaxAcquiredBuffers - (int32_t)mCurrentMaxAcquiredBufferCount) : 0;





    auto rb = ReleasedBuffer{id, releaseFence};

    auto rb = ReleasedBuffer{id, releaseFence};

    if (std::find(mPendingRelease.begin(), mPendingRelease.end(), rb) == mPendingRelease.end()) {

    if (std::find(mPendingRelease.begin(), mPendingRelease.end(), rb) == mPendingRelease.end()) {