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

Commit 312f6c76 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

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

* commit '95482b61c348fc54bf44a96a8b73011c90b40520':
  Fix an issue where we could wait for a non-existing transaction
parents 72f7fbea 0fe35d09

services/surfaceflinger/SurfaceFlinger.cpp

+16 −14
Original line number Original line 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()) );

        sp<Client> client( static_cast<Client *>(s.client.get()) );

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

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

    }

    }



    if (transactionFlags) {

    if (transactionFlags) {

        // this triggers the transaction

        setTransactionFlags(transactionFlags);

        setTransactionFlags(transactionFlags);

    }





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

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

    // returning.

        // before returning.

        if (flags & eSynchronous) {

        if (flags & eSynchronous) {

            mTransationPending = true;

            mTransationPending = true;

        }

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

            }

        }

        }

    }

    }

}





int SurfaceFlinger::setOrientation(DisplayID dpy,

int SurfaceFlinger::setOrientation(DisplayID dpy,

        int orientation, uint32_t flags)

        int orientation, uint32_t flags)