commit f99f788f676d72e8eaa143bbf4ba11faaea82dc8
author Carlos Martinez Romero <carlosmr@google.com> Wed Dec 11 11:42:15 2024 -0800
committer Carlos Martinez Romero <carlosmr@google.com> Thu Dec 12 11:01:02 2024 -0800
tree 391d2c3bb9880c727a2a3900f48081f1e999aba2
parent 96f8bb84cd4085356bacd9d627acb8242c030599

Update test to not use IGraphicBufferProducer.

We have removed references of IGraphicBufferProducer outside of libgui
so this include is no longer necessary. More information at
go/warren-buffers.

Bug: 342197851
Test: build and run
Flag: com.android.graphics.libgui.flags.wb_consumer_base_owns_bq
Change-Id: I41855decff0380bffc4ba56b0e0f014412f297ad

camera/tests/CameraBinderTests.cpp

diff --git a/camera/tests/CameraBinderTests.cpp b/camera/tests/CameraBinderTests.cpp
index 89fc033..7f99b70 100644
--- a/camera/tests/CameraBinderTests.cpp
+++ b/camera/tests/CameraBinderTests.cpp
@@ -49,7 +49,9 @@
 
 #include <com_android_graphics_libgui_flags.h>
 #include <gui/BufferItemConsumer.h>
+#if not COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_CONSUMER_BASE_OWNS_BQ)
 #include <gui/IGraphicBufferProducer.h>
+#endif
 #include <gui/Surface.h>
 
 #include <gtest/gtest.h>
@@ -704,10 +706,20 @@
 
 TEST_F(CameraClientBinderTest, CheckBinderCaptureRequest) {
     sp<CaptureRequest> requestOriginal, requestParceled;
+
+#if COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_CONSUMER_BASE_OWNS_BQ)
+    sp<BufferItemConsumer> opaqueConsumer = new BufferItemConsumer(
+            GRALLOC_USAGE_SW_READ_NEVER, /*maxImages*/ 2, /*controlledByApp*/ true);
+    EXPECT_TRUE(opaqueConsumer.get() != nullptr);
+    opaqueConsumer->setName(String8("nom nom nom"));
+    sp<Surface> surface = opaqueConsumer->getSurface();
+#else
     sp<IGraphicBufferProducer> gbProducer;
     sp<IGraphicBufferConsumer> gbConsumer;
     BufferQueue::createBufferQueue(&gbProducer, &gbConsumer);
     sp<Surface> surface(new Surface(gbProducer, /*controlledByApp*/false));
+#endif
+
     Vector<sp<Surface>> surfaceList;
     surfaceList.push_back(surface);
     std::string physicalDeviceId1 = "0";