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

Commit bbc85626 authored by Robert Carr's avatar Robert Carr
Browse files

SurfaceComposerClient BLAST Transactions: Correctly merge mContainsBuffer 

If we merge a transaction which does not contain a buffer in to a transaction
which already contained a buffer, the resulting transaction still needs to
have mContainsBuffer=true, otherwise we won't properly cache the buffers.

Bug: 153561718
Test: Existing tests pass. Manual test of BLASTSyncEngine.
Change-Id: Ic63aba390757285730cb19406dc5c6b73d0c3437
parent 5653ee25

libs/gui/SurfaceComposerClient.cpp

+1 −1
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::merge(Tr 


    mInputWindowCommands.merge(other.mInputWindowCommands);



    mContainsBuffer = other.mContainsBuffer;

    mContainsBuffer |= other.mContainsBuffer;

    mEarlyWakeup = mEarlyWakeup || other.mEarlyWakeup;

    other.clear();

    return *this;