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

Commit 0b119c2d authored by Valerie Hau's avatar Valerie Hau Committed by android-build-merger
Browse files

Merge "Adding applyToken for any setTransactionState call" into qt-dev 

am: b1d235e7

Change-Id: I7b2737137d02cdccc12ffbecd0284220f66e9e96
parents cd638e6e b1d235e7

libs/gui/SurfaceComposerClient.cpp

+4 −2
Original line number Diff line number Diff line
@@ -381,7 +381,8 @@ void SurfaceComposerClient::doDropReferenceTransaction(const sp<IBinder>& handle 
    s.state.parentHandleForChild = nullptr;



    composerStates.add(s);

    sf->setTransactionState(composerStates, displayStates, 0, nullptr, {}, -1, {}, {});

    sp<IBinder> applyToken = IInterface::asBinder(TransactionCompletedListener::getIInstance());

    sf->setTransactionState(composerStates, displayStates, 0, applyToken, {}, -1, {}, {});

}



void SurfaceComposerClient::doUncacheBufferTransaction(uint64_t cacheId) {
@@ -391,7 +392,8 @@ void SurfaceComposerClient::doUncacheBufferTransaction(uint64_t cacheId) { 
    uncacheBuffer.token = BufferCache::getInstance().getToken();

    uncacheBuffer.cacheId = cacheId;



    sf->setTransactionState({}, {}, 0, nullptr, {}, -1, uncacheBuffer, {});

    sp<IBinder> applyToken = IInterface::asBinder(TransactionCompletedListener::getIInstance());

    sf->setTransactionState({}, {}, 0, applyToken, {}, -1, uncacheBuffer, {});

}



void SurfaceComposerClient::Transaction::cacheBuffers() {