Snap for 5443865 from 94c1d740cfe001e5faf62d3c447c4e1e9f4aa325 to pi-qpr3-b-release
Change-Id: If6fae3356fb3156b091b246657da366740b1899b
diff --git a/libs/gui/BufferQueueCore.cpp b/libs/gui/BufferQueueCore.cpp
index 7dddd8b..bb703da 100644
--- a/libs/gui/BufferQueueCore.cpp
+++ b/libs/gui/BufferQueueCore.cpp
@@ -73,7 +73,6 @@
mActiveBuffers(),
mDequeueCondition(),
mDequeueBufferCannotBlock(false),
- mQueueBufferCanDrop(false),
mDefaultBufferFormat(PIXEL_FORMAT_RGBA_8888),
mDefaultWidth(1),
mDefaultHeight(1),
diff --git a/libs/gui/BufferQueueProducer.cpp b/libs/gui/BufferQueueProducer.cpp
index c01b2b6..c96a2dd 100644
--- a/libs/gui/BufferQueueProducer.cpp
+++ b/libs/gui/BufferQueueProducer.cpp
@@ -872,7 +872,7 @@
item.mFence = acquireFence;
item.mFenceTime = acquireFenceTime;
item.mIsDroppable = mCore->mAsyncMode ||
- mCore->mQueueBufferCanDrop ||
+ mCore->mDequeueBufferCannotBlock ||
(mCore->mSharedBufferMode && mCore->mSharedBufferSlot == slot);
item.mSurfaceDamage = surfaceDamage;
item.mQueuedBuffer = true;
@@ -1213,10 +1213,9 @@
mCore->mConnectedPid = IPCThreadState::self()->getCallingPid();
mCore->mBufferHasBeenQueued = false;
mCore->mDequeueBufferCannotBlock = false;
- mCore->mQueueBufferCanDrop = false;
- if (mCore->mConsumerControlledByApp && producerControlledByApp) {
- mCore->mDequeueBufferCannotBlock = mDequeueTimeout < 0;
- mCore->mQueueBufferCanDrop = mDequeueTimeout <= 0;
+ if (mDequeueTimeout < 0) {
+ mCore->mDequeueBufferCannotBlock =
+ mCore->mConsumerControlledByApp && producerControlledByApp;
}
mCore->mAllowAllocation = true;
@@ -1487,12 +1486,7 @@
}
mDequeueTimeout = timeout;
- if (timeout >= 0) {
- mCore->mDequeueBufferCannotBlock = false;
- if (timeout != 0) {
- mCore->mQueueBufferCanDrop = false;
- }
- }
+ mCore->mDequeueBufferCannotBlock = false;
VALIDATE_CONSISTENCY();
return NO_ERROR;
diff --git a/libs/gui/include/gui/BufferQueueCore.h b/libs/gui/include/gui/BufferQueueCore.h
index f91babc..537c957 100644
--- a/libs/gui/include/gui/BufferQueueCore.h
+++ b/libs/gui/include/gui/BufferQueueCore.h
@@ -225,11 +225,6 @@
// consumer are controlled by the application.
bool mDequeueBufferCannotBlock;
- // mQueueBufferCanDrop indicates whether queueBuffer is allowd to drop
- // buffers in non-async mode. This flag is set during connect when both the
- // producer and consumer are controlled by application.
- bool mQueueBufferCanDrop;
-
// mDefaultBufferFormat can be set so it will override the buffer format
// when it isn't specified in dequeueBuffer.
PixelFormat mDefaultBufferFormat;
diff --git a/libs/gui/include/gui/IGraphicBufferProducer.h b/libs/gui/include/gui/IGraphicBufferProducer.h
index 2f8a154..887654e 100644
--- a/libs/gui/include/gui/IGraphicBufferProducer.h
+++ b/libs/gui/include/gui/IGraphicBufferProducer.h
@@ -584,10 +584,6 @@
// non-blocking mode and its corresponding spare buffer (which is used to
// ensure a buffer is always available).
//
- // N.B. queueBuffer will stop buffer dropping behavior if timeout is
- // strictly positive. If timeout is zero or negative, previous buffer
- // dropping behavior will not be changed.
- //
// Return of a value other than NO_ERROR means an error has occurred:
// * BAD_VALUE - Failure to adjust the number of available slots. This can
// happen because of trying to allocate/deallocate the async
