commit db89edc94bd2a78226b407f9f7261e202e7fa325
author Mathias Agopian <mathias@google.com> Fri Aug 02 01:40:18 2013 -0700
committer Mathias Agopian <mathias@google.com> Tue Aug 06 20:05:36 2013 +0000
tree 007ffcc43a42459a5a089d3be8c51f81d40dd096
parent 687821c05b5a85db1b172e7599861c803d268a8d

All consumers now take an IGraphicBufferConsumer instead of a BufferQueue

this means they only have access to the consumer end of
the interface. we had a lot of code that assumed consumers
where holding a BufferQueue (i.e.: both ends), so most of
this change is untangling in fix that

Bug: 9265647
Change-Id: Ic2e2596ee14c7535f51bf26d9a897a0fc036d22c

libs/gui/tests/SurfaceTexture_test.cpp

diff --git a/libs/gui/tests/SurfaceTexture_test.cpp b/libs/gui/tests/SurfaceTexture_test.cpp
index ae223c6..05b0b67 100644
--- a/libs/gui/tests/SurfaceTexture_test.cpp
+++ b/libs/gui/tests/SurfaceTexture_test.cpp
@@ -387,7 +387,7 @@
         GLTest::SetUp();
         sp<BufferQueue> bq = new BufferQueue();
         mGlConsumer = new GLConsumer(bq, TEX_ID);
-        mSurface = new Surface(mGlConsumer->getBufferQueue());
+        mSurface = new Surface(bq);
         mANW = mSurface.get();
 
     }
@@ -481,8 +481,9 @@
     virtual void SetUp() {
         GLTest::SetUp();
         sp<BufferQueue> bq = new BufferQueue();
+        mBQ = bq;
         mST = new GLConsumer(bq, TEX_ID);
-        mSTC = new Surface(mST->getBufferQueue());
+        mSTC = new Surface(bq);
         mANW = mSTC;
         mTextureRenderer = new TextureRenderer(TEX_ID, mST);
         ASSERT_NO_FATAL_FAILURE(mTextureRenderer->SetUp());
@@ -672,6 +673,7 @@
         Condition mFrameCondition;
     };
 
+    sp<BufferQueue> mBQ;
     sp<GLConsumer> mST;
     sp<Surface> mSTC;
     sp<ANativeWindow> mANW;
@@ -1211,7 +1213,7 @@
     };
 
     sp<DisconnectWaiter> dw(new DisconnectWaiter());
-    mST->getBufferQueue()->consumerConnect(dw, false);
+    mBQ->consumerConnect(dw, false);
 
 
     sp<Thread> pt(new ProducerThread(mANW));