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

Commit 95482b61 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

Merge "Fix an issue where we could wait for a non-existing transaction" into ics-mr1

parents 59c73b92 a06c06b9

services/surfaceflinger/SurfaceFlinger.cpp

+16 −14
Original line number Diff line number Diff line
@@ -1217,12 +1217,13 @@ void SurfaceFlinger::setTransactionState(const Vector<ComposerState>& state, 
        sp<Client> client( static_cast<Client *>(s.client.get()) );

        transactionFlags |= setClientStateLocked(client, s.state);

    }



    if (transactionFlags) {

        // this triggers the transaction

        setTransactionFlags(transactionFlags);

    }



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

    // returning.

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

        // before returning.

        if (flags & eSynchronous) {

            mTransationPending = true;

        }
@@ -1237,6 +1238,7 @@ void SurfaceFlinger::setTransactionState(const Vector<ComposerState>& state, 
            }

        }

    }

}



int SurfaceFlinger::setOrientation(DisplayID dpy,

        int orientation, uint32_t flags)