Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4b0ad135: am 98a9c56a: attempt to work around [2155085, 2150246] stuck in closeTransaction()

Browse Source 
Merge commit '4b0ad1359b96e86cbb0827a3e88aade4223587cd'

* commit '4b0ad1359b96e86cbb0827a3e88aade4223587cd':
  attempt to work around [2155085, 2150246] stuck in closeTransaction()
This commit is contained in:
Mathias Agopian
2009-10-01 12:22:03 -07:00
committed by Android Git Automerger
parent dffcf5eae9 4b0ad1359b
commit d86fce3fb4
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libs/surfaceflinger/SurfaceFlinger.cpp
View File

@@ -1125,7 +1125,14 @@ void SurfaceFlinger::closeGlobalTransaction()
// take effect before returning.
Mutex::Autolock _l(mStateLock);
while (mResizeTransationPending) {
mTransactionCV.wait(mStateLock);
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
// called after a few seconds.
LOGW_IF(err == TIMED_OUT, "closeGlobalTransaction timed out!");
mResizeTransationPending = false;
break;
}
}
}
}