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 /include/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 'include/ui')
| -rw-r--r-- | include/ui/Fence.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/ui/Fence.h b/include/ui/Fence.h index 81d5d09..60156e7 100644 --- a/include/ui/Fence.h +++ b/include/ui/Fence.h @@ -70,9 +70,10 @@ public: // waitForever is a convenience function for waiting forever for a fence to // signal (just like wait(TIMEOUT_NEVER)), but issuing an error to the // system log and fence state to the kernel log if the wait lasts longer - // than warningTimeout. The logname argument should be a string identifying + // than a warning timeout. + // The logname argument should be a string identifying // the caller and will be included in the log message. - status_t waitForever(unsigned int warningTimeout, const char* logname); + status_t waitForever(const char* logname); // merge combines two Fence objects, creating a new Fence object that // becomes signaled when both f1 and f2 are signaled (even if f1 or f2 is |