diff options
| author | Jesse Hall <jessehall@google.com> | 2012-10-01 14:05:20 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-02 16:29:46 -0700 |
| commit | ba607d53c6a94ea8c4c12571980c4ad159af308b (patch) | |
| tree | 80458eab2d99780520b25b83b5c09ea13461387c /libs/gui/SurfaceTexture.cpp | |
| parent | 2ae7bec77093744206080dbae020edfa3bfac2e1 (diff) | |
| download | frameworks_native-ba607d53c6a94ea8c4c12571980c4ad159af308b.zip frameworks_native-ba607d53c6a94ea8c4c12571980c4ad159af308b.tar.gz frameworks_native-ba607d53c6a94ea8c4c12571980c4ad159af308b.tar.bz2 | |
Add Fence::waitForever which logs a warning timeout, and use it
Bug: 7217641
Change-Id: If0c1a613ead307c4045a47824174bf40c72bc7d7
Diffstat (limited to 'libs/gui/SurfaceTexture.cpp')
| -rw-r--r-- | libs/gui/SurfaceTexture.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/gui/SurfaceTexture.cpp b/libs/gui/SurfaceTexture.cpp index 7daa074..8df1302 100644 --- a/libs/gui/SurfaceTexture.cpp +++ b/libs/gui/SurfaceTexture.cpp @@ -812,7 +812,8 @@ status_t SurfaceTexture::doGLFenceWaitLocked() const { return UNKNOWN_ERROR; } } else { - status_t err = mCurrentFence->wait(Fence::TIMEOUT_NEVER); + status_t err = mCurrentFence->waitForever(1000, + "SurfaceTexture::doGLFenceWaitLocked"); if (err != NO_ERROR) { ST_LOGE("doGLFenceWait: error waiting for fence: %d", err); return err; |