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

Commit 617cf158 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "blast: transaction ordering" into qt-dev

parents 6c7d5c27 b0022cc4

services/surfaceflinger/SurfaceFlinger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -3620,7 +3620,7 @@ void SurfaceFlinger::applyTransactionState(const Vector<ComposerState>& states, 
    }



    // If the state doesn't require a traversal and there are callbacks, send them now

    if (!(clientStateFlags & eTraversalNeeded)) {

    if (!(clientStateFlags & eTraversalNeeded) && !listenerCallbacks.empty()) {

        mTransactionCompletedThread.sendCallbacks();

    }

    transactionFlags |= clientStateFlags;

services/surfaceflinger/TransactionCompletedThread.cpp

+3 −3
Original line number Diff line number Diff line
@@ -141,12 +141,12 @@ status_t TransactionCompletedThread::addPresentedCallbackHandles( 
            } else {

                ALOGW("there are more latched callbacks than there were registered callbacks");

            }

        } else {

            ALOGW("cannot find listener in mPendingTransactions");

        }

            if (listener->second.size() == 0) {

                mPendingTransactions.erase(listener);

            }

        } else {

            ALOGW("cannot find listener in mPendingTransactions");

        }



        status_t err = addCallbackHandle(handle);

        if (err != NO_ERROR) {