am a069e853: am 649bafb7: Merge "bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)" into lmp-dev

* commit 'a069e8532ba272ac5b935e332e426a3dacf827fc':
  bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)
This commit is contained in:
Jesse Hall 2014-10-20 14:31:38 +00:00 committed by Android Git Automerger
commit 937052fb1c

View File

@ -523,7 +523,12 @@ status_t BufferQueueProducer::queueBuffer(int slot,
if (fence == NULL) { if (fence == NULL) {
BQ_LOGE("queueBuffer: fence is NULL"); BQ_LOGE("queueBuffer: fence is NULL");
return BAD_VALUE; // 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;
} }
switch (scalingMode) { switch (scalingMode) {