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

am caadbc53: am 7c41bf70: SurfaceFlinger: change the animation timeout 

* commit 'caadbc5324cd4503450ac6bd9bb09c3c5fcb7430':
  SurfaceFlinger: change the animation timeout
This commit is contained in:
Jamie Gennis 2012-10-17 16:58:54 -07:00 committed by Android Git Automerger
parent 54c6497530 caadbc5324
commit 5937c9d581
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,
uint32_t flags)
{
ATRACE_CALL();
Mutex::Autolock _l(mStateLock);
uint32_t transactionFlags = 0;
@ -1671,11 +1672,12 @@ void SurfaceFlinger::setTransactionState(
// For window updates that are part of an animation we must wait for
// previous animation "frames" to be handled.
while (mAnimTransactionPending) {
status_t err = mTransactionCV.waitRelative(mStateLock, 500 * 1000);
status_t err = mTransactionCV.waitRelative(mStateLock, s2ns(5));
if (CC_UNLIKELY(err != NO_ERROR)) {
// just in case something goes wrong in SF, return to the
// caller after a few hundred microseconds.
ALOGW_IF(err == TIMED_OUT, "setTransactionState timed out!");
// caller after a few seconds.
ALOGW_IF(err == TIMED_OUT, "setTransactionState timed out "
"waiting for previous animation frame");
mAnimTransactionPending = false;
break;
}