ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mathias Agopian 2011-11-08 15:55:55 -08:00 committed by Android (Google) Code Review
commit 0fe35d093b
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -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) {
setTransactionFlags(transactionFlags);
}
// if this is a synchronous transaction, wait for it to take effect before if (transactionFlags) {
// returning. // this triggers the transaction
setTransactionFlags(transactionFlags);
// if this is a synchronous transaction, wait for it to take effect
// 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)