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

Commit 6fcb0f2c authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Automerger Merge Worker
Browse files

Merge "Clear transaction that's passed to mergeWithNextTransaction" into sc-dev am: 4fd10d8d 

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

Change-Id: I592fb23a4b254d4cec84889a8d558401aa1635f8
parents 958033de 4fd10d8d

libs/gui/BLASTBufferQueue.cpp

+3 −1
Original line number Diff line number Diff line
@@ -606,7 +606,9 @@ void BLASTBufferQueue::mergeWithNextTransaction(SurfaceComposerClient::Transacti 
        // Apply the transaction since we have already acquired the desired frame.

        t->apply();

    } else {

        mPendingTransactions.emplace_back(frameNumber, std::move(*t));

        mPendingTransactions.emplace_back(frameNumber, *t);

        // Clear the transaction so it can't be applied elsewhere.

        t->clear();

    }

}