Change BufferQueue into producer/consumer wrapper

Now that BufferQueue has been split into core + producer + consumer,
rewrite BufferQueue to be a thin layer over a producer and consumer
interface. Eventually, this layer will be deprecated in favor of
only using either the producer or consumer interface, as applicable.

Change-Id: I340ae5f5b633b244fb594615ff52ba50b9e2f7e4

1 files changed, 3 insertions, 1 deletions

diff --git a/libs/gui/BufferItem.cpp b/libs/gui/BufferItem.cpp
index cccb38e..d3fa43e 100644
--- a/libs/gui/BufferItem.cpp
+++ b/libs/gui/BufferItem.cpp
@@ -38,6 +38,9 @@ BufferItem::BufferItem() :
 
 BufferItem::operator IGraphicBufferConsumer::BufferItem() const {
     IGraphicBufferConsumer::BufferItem bufferItem;
+    bufferItem.mGraphicBuffer = mGraphicBuffer;
+    bufferItem.mFence = mFence;
+    bufferItem.mCrop = mCrop;
     bufferItem.mTransform = mTransform;
     bufferItem.mScalingMode = mScalingMode;
     bufferItem.mTimestamp = mTimestamp;
@@ -47,7 +50,6 @@ BufferItem::operator IGraphicBufferConsumer::BufferItem() const {
     bufferItem.mIsDroppable = mIsDroppable;
     bufferItem.mAcquireCalled = mAcquireCalled;
     bufferItem.mTransformToDisplayInverse = mTransformToDisplayInverse;
-    bufferItem.mCrop = mCrop;
     return bufferItem;
 }