summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Hall <jessehall@google.com>2014-11-04 08:30:48 -0800
committerJesse Hall <jessehall@google.com>2014-11-04 08:47:37 -0800
commitde288fe2d43adfa1b2243ae534faaf832bf50491 (patch)
treea5759c8b39ddeb93c6e3bf8c6958981f1e8252ce
parent7aa0c47e4205c6fca136c38f272d911c25c8a8fa (diff)
downloadframeworks_native-de288fe2d43adfa1b2243ae534faaf832bf50491.zip
frameworks_native-de288fe2d43adfa1b2243ae534faaf832bf50491.tar.gz
frameworks_native-de288fe2d43adfa1b2243ae534faaf832bf50491.tar.bz2
Revert "bufferqueue: workaround: allow NULL fence with queueBuffer"
Underlying bug has been fixed, workaround no longer needed This reverts commit 5b0cbcf9464dbcda9d19ae978911222806ec8bdc. Change-Id: Ic9532b407d1291a7780a12a75aaa117ae4aa9fcb
-rw-r--r--libs/gui/BufferQueueProducer.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/libs/gui/BufferQueueProducer.cpp b/libs/gui/BufferQueueProducer.cpp
index 284ddb2..03bd4fd 100644
--- a/libs/gui/BufferQueueProducer.cpp
+++ b/libs/gui/BufferQueueProducer.cpp
@@ -523,12 +523,7 @@ status_t BufferQueueProducer::queueBuffer(int slot,
if (fence == NULL) {
BQ_LOGE("queueBuffer: fence is NULL");
- // Temporary workaround for b/17946343: soldier-on instead of returning an error. This
- // prevents the client from dying, at the risk of visible corruption due to hwcomposer
- // reading the buffer before the producer is done rendering it. Unless the buffer is the
- // last frame of an animation, the corruption will be transient.
- fence = Fence::NO_FENCE;
- // return BAD_VALUE;
+ return BAD_VALUE;
}
switch (scalingMode) {