diff options
| author | 2013-05-16 18:03:22 -0700 | |
|---|---|---|
| committer | 2013-05-16 18:15:57 -0700 | |
| commit | ea74d3b78d607cde17790a7bb83e6f68ffd34cfd (patch) | |
| tree | 5f8c6c6905868d4f92c6834ddf46d6e42981116b /libs/gui/Surface.cpp | |
| parent | f743e3db27dd639421913ee5e99d7a13ccc236ea (diff) | |
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/gui/Surface.cpp')
| -rw-r--r-- | libs/gui/Surface.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/gui/Surface.cpp b/libs/gui/Surface.cpp index 4a58023541..a616c1e417 100644 --- a/libs/gui/Surface.cpp +++ b/libs/gui/Surface.cpp @@ -113,7 +113,7 @@ int Surface::hook_dequeueBuffer_DEPRECATED(ANativeWindow* window, int fenceFd = -1; int result = c->dequeueBuffer(&buf, &fenceFd); sp<Fence> fence(new Fence(fenceFd)); - int waitResult = fence->waitForever(1000, "dequeueBuffer_DEPRECATED"); + int waitResult = fence->waitForever("dequeueBuffer_DEPRECATED"); if (waitResult != OK) { ALOGE("dequeueBuffer_DEPRECATED: Fence::wait returned an error: %d", waitResult); @@ -734,7 +734,7 @@ status_t Surface::lock( sp<GraphicBuffer> backBuffer(GraphicBuffer::getSelf(out)); sp<Fence> fence(new Fence(fenceFd)); - err = fence->waitForever(1000, "Surface::lock"); + err = fence->waitForever("Surface::lock"); if (err != OK) { ALOGE("Fence::wait failed (%s)", strerror(-err)); cancelBuffer(out, fenceFd); |