summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Hall <jessehall@google.com>2014-11-04 17:35:22 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-04 17:35:22 +0000
commitaa4ccfd123620f8dd28c4ae65a2a5aa3b8a0f83e (patch)
tree595431621041737f9473c097e9cd7c3ada9562d0
parent923b0f6a6787462509c23349ac04b8e9360c51cc (diff)
parentde288fe2d43adfa1b2243ae534faaf832bf50491 (diff)
downloadframeworks_native-aa4ccfd123620f8dd28c4ae65a2a5aa3b8a0f83e.zip
frameworks_native-aa4ccfd123620f8dd28c4ae65a2a5aa3b8a0f83e.tar.gz
frameworks_native-aa4ccfd123620f8dd28c4ae65a2a5aa3b8a0f83e.tar.bz2
am de288fe2: Revert "bufferqueue: workaround: allow NULL fence with queueBuffer"
* commit 'de288fe2d43adfa1b2243ae534faaf832bf50491': Revert "bufferqueue: workaround: allow NULL fence with queueBuffer"
-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) {