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

Commit 89a466be authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Unify the types of two NumFrame variables and Code Optimization" into main am: 003da7db 

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



Change-Id: I741c16539ae263a25a9a286ac96ada374dae30b6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 66e80a3a 003da7db

libs/gui/BLASTBufferQueue.cpp

+1 −3
Original line number Diff line number Diff line
@@ -210,8 +210,6 @@ BLASTBufferQueue::BLASTBufferQueue(const std::string& name, bool updateDestinati 
    ComposerServiceAIDL::getComposerService()->getMaxAcquiredBufferCount(&mMaxAcquiredBuffers);

    mBufferItemConsumer->setMaxAcquiredBufferCount(mMaxAcquiredBuffers);

    mCurrentMaxAcquiredBufferCount = mMaxAcquiredBuffers;

    mNumAcquired = 0;

    mNumFrameAvailable = 0;



    TransactionCompletedListener::getInstance()->addQueueStallListener(

            [&](const std::string& reason) {
@@ -436,7 +434,7 @@ void BLASTBufferQueue::transactionCallback(nsecs_t /*latchTime*/, const sp<Fence 


void BLASTBufferQueue::flushShadowQueue() {

    BQA_LOGV("flushShadowQueue");

    int numFramesToFlush = mNumFrameAvailable;

    int32_t numFramesToFlush = mNumFrameAvailable;

    while (numFramesToFlush > 0) {

        acquireNextBufferLocked(std::nullopt);

        numFramesToFlush--;