summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorJesse Hall <jessehall@google.com>2012-10-01 14:05:20 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-02 16:29:46 -0700
commitba607d53c6a94ea8c4c12571980c4ad159af308b (patch)
tree80458eab2d99780520b25b83b5c09ea13461387c /services
parent2ae7bec77093744206080dbae020edfa3bfac2e1 (diff)
downloadframeworks_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 'services')
-rw-r--r--services/surfaceflinger/DisplayHardware/HWComposer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
index d4adad2..fb93c47 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@ -686,7 +686,7 @@ int HWComposer::fbPost(int32_t id,
return setFramebufferTarget(id, acquireFence, buffer);
} else {
if (acquireFence != NULL) {
- acquireFence->wait(Fence::TIMEOUT_NEVER);
+ acquireFence->waitForever(1000, "HWComposer::fbPost");
}
return mFbDev->post(mFbDev, buffer->handle);
}