summaryrefslogtreecommitdiffstats
path: root/libs/ui
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2013-05-16 18:03:22 -0700
committerMathias Agopian <mathias@google.com>2013-05-16 18:15:57 -0700
commitea74d3b78d607cde17790a7bb83e6f68ffd34cfd (patch)
tree5f8c6c6905868d4f92c6834ddf46d6e42981116b /libs/ui
parentf743e3db27dd639421913ee5e99d7a13ccc236ea (diff)
downloadframeworks_native-ea74d3b78d607cde17790a7bb83e6f68ffd34cfd.zip
frameworks_native-ea74d3b78d607cde17790a7bb83e6f68ffd34cfd.tar.gz
frameworks_native-ea74d3b78d607cde17790a7bb83e6f68ffd34cfd.tar.bz2
make the warning timout of Fence::waitForever() implicit and longer
- timeout is now 3 seconds instead of 1 - simplifies the API a bit - allows us to change/tweak this timeout globaly Bug: 8988871 Change-Id: I8d3c6ec43a372f602fb3f29856710339f86c0ec9
Diffstat (limited to 'libs/ui')
-rw-r--r--libs/ui/Fence.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/ui/Fence.cpp b/libs/ui/Fence.cpp
index b9e0f00..464ee86 100644
--- a/libs/ui/Fence.cpp
+++ b/libs/ui/Fence.cpp
@@ -54,11 +54,12 @@ status_t Fence::wait(unsigned int timeout) {
return err < 0 ? -errno : status_t(NO_ERROR);
}
-status_t Fence::waitForever(unsigned int warningTimeout, const char* logname) {
+status_t Fence::waitForever(const char* logname) {
ATRACE_CALL();
if (mFenceFd == -1) {
return NO_ERROR;
}
+ unsigned int warningTimeout = 3000;
int err = sync_wait(mFenceFd, warningTimeout);
if (err < 0 && errno == ETIME) {
ALOGE("%s: fence %d didn't signal in %u ms", logname, mFenceFd,