Merge "SurfaceFlinger: Only block calling thread on sync transactions." into...

                                                  : Scheduler::TransactionStart::NORMAL;

        setTransactionFlags(transactionFlags, start);

        if (flags & eAnimation) {

            mAnimTransactionPending = true;

        }

        // if this is a synchronous transaction, wait for it to take effect

        // before returning.

        if (flags & eSynchronous) {

            mTransactionPending = true;

        const bool synchronous = flags & eSynchronous;

        const bool syncInput = inputWindowCommands.syncInputWindows;

        if (!synchronous && !syncInput) {

            return;

        }

        if (flags & eAnimation) {

            mAnimTransactionPending = true;

        if (synchronous) {

            mTransactionPending = true;

        }

        if (mPendingInputWindowCommands.syncInputWindows) {

        if (syncInput) {

            mPendingSyncInputWindows = true;

        }

        // applyTransactionState can be called by either the main SF thread or by

        // another process through setTransactionState.  While a given process may wish

        // to wait on synchronous transactions, the main SF thread should never