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/Surface_test.cpp

diff --git a/libs/gui/tests/Surface_test.cpp b/libs/gui/tests/Surface_test.cpp
index bcdbedb..0440c4c 100644
--- a/libs/gui/tests/Surface_test.cpp
+++ b/libs/gui/tests/Surface_test.cpp
@@ -92,7 +92,7 @@
     sp<CpuConsumer> consumer = new CpuConsumer(bq, 1);
     sp<ISurfaceComposer> sf(ComposerService::getComposerService());
     sp<IBinder> display(sf->getBuiltInDisplay(ISurfaceComposer::eDisplayIdMain));
-    ASSERT_EQ(NO_ERROR, sf->captureScreen(display, consumer->getBufferQueue(),
+    ASSERT_EQ(NO_ERROR, sf->captureScreen(display, bq,
             64, 64, 0, 0x7fffffff, true));
 
     // Set the PROTECTED usage bit and verify that the screenshot fails.  Note
@@ -121,7 +121,7 @@
                 &buf));
         ASSERT_EQ(NO_ERROR, anw->queueBuffer(anw.get(), buf, -1));
     }
-    ASSERT_EQ(NO_ERROR, sf->captureScreen(display, consumer->getBufferQueue(),
+    ASSERT_EQ(NO_ERROR, sf->captureScreen(display, bq,
             64, 64, 0, 0x7fffffff, true));
 }