diff options
| author | Jesse Hall <jessehall@google.com> | 2014-10-20 13:59:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-20 13:59:25 +0000 |
| commit | 649bafb7ba2c3204295bc3451ff7af7e28e714ed (patch) | |
| tree | 1888c403b8501a86528ad68f5bcbfd9667aaa8ea | |
| parent | 0b6acb2231baed861488f2d181621272d0658d25 (diff) | |
| parent | 5b0cbcf9464dbcda9d19ae978911222806ec8bdc (diff) | |
| download | native-lollipop-dev.tar.gz | |
Merge "bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)" into lmp-devlollipop-dev
| -rw-r--r-- | libs/gui/BufferQueueProducer.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libs/gui/BufferQueueProducer.cpp b/libs/gui/BufferQueueProducer.cpp index a53775fa75..d2fd3b0255 100644 --- a/libs/gui/BufferQueueProducer.cpp +++ b/libs/gui/BufferQueueProducer.cpp @@ -522,7 +522,12 @@ status_t BufferQueueProducer::queueBuffer(int slot, if (fence == 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) { |