diff options
| author | Mathias Agopian <mathias@google.com> | 2013-05-17 10:18:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-17 10:18:45 -0700 |
| commit | 2381033ad001960c606d13e3a4198e5da3672ec7 (patch) | |
| tree | 7c6e6419798e96aa804d1aff3affd62b3a6e2d28 /libs/ui | |
| parent | a6fee1904fe729688fdb3977473932fb61447975 (diff) | |
| parent | e6eef6c136b007f3a7e1e19884875b855c0c5f95 (diff) | |
| download | frameworks_native-2381033ad001960c606d13e3a4198e5da3672ec7.zip frameworks_native-2381033ad001960c606d13e3a4198e5da3672ec7.tar.gz frameworks_native-2381033ad001960c606d13e3a4198e5da3672ec7.tar.bz2 | |
am e6eef6c1: am ea74d3b7: make the warning timout of Fence::waitForever() implicit and longer
* commit 'e6eef6c136b007f3a7e1e19884875b855c0c5f95':
make the warning timout of Fence::waitForever() implicit and longer
Diffstat (limited to 'libs/ui')
| -rw-r--r-- | libs/ui/Fence.cpp | 3 |
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, |