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

am 7c41bf70: SurfaceFlinger: change the animation timeout

Browse Source 
* commit '7c41bf7092b75dba6029cd3bbc842d3a2661b0aa':
  SurfaceFlinger: change the animation timeout
This commit is contained in:
Jamie Gennis 2012-10-17 16:57:01 -07:00 committed by Android Git Automerger
commit caadbc5324
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -1664,6 +1664,7 @@ void SurfaceFlinger::setTransactionState(
const Vector<DisplayState>& displays, const Vector<DisplayState>& displays,
uint32_t flags) uint32_t flags)
{ {
ATRACE_CALL();
Mutex::Autolock _l(mStateLock); Mutex::Autolock _l(mStateLock);
uint32_t transactionFlags = 0; uint32_t transactionFlags = 0;
@ -1671,11 +1672,12 @@ void SurfaceFlinger::setTransactionState(
// For window updates that are part of an animation we must wait for // For window updates that are part of an animation we must wait for
// previous animation "frames" to be handled. // previous animation "frames" to be handled.
while (mAnimTransactionPending) { while (mAnimTransactionPending) {
status_t err = mTransactionCV.waitRelative(mStateLock, 500 * 1000); status_t err = mTransactionCV.waitRelative(mStateLock, s2ns(5));
if (CC_UNLIKELY(err != NO_ERROR)) { if (CC_UNLIKELY(err != NO_ERROR)) {
// just in case something goes wrong in SF, return to the // just in case something goes wrong in SF, return to the
// caller after a few hundred microseconds. // caller after a few seconds.
ALOGW_IF(err == TIMED_OUT, "setTransactionState timed out!"); ALOGW_IF(err == TIMED_OUT, "setTransactionState timed out "
"waiting for previous animation frame");
mAnimTransactionPending = false; mAnimTransactionPending = false;
break; break;
} }