Skip to content

Commit a2ab5be

Browse files
author
Jim Shargo
committed
tests: Improve logging for objects that are causing errors
In b/374973152, we're seeing error logs surrounding a generic "Virtual disp consumer", which is used in several places. This makes it harder to understand what's broken. This change clarifies the names. Bug: 374973152 Flag: EXEMPT tests Test: atest Change-Id: Ib1974f304f6c64c1d7ae02e0b77ec829d14ba0f1
1 parent 918fc16 commit a2ab5be

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

libs/gui/tests/EndToEndNativeInputTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1212,7 +1212,7 @@ class MultiDisplayTests : public InputSurfacesTest {
12121212
sp<IGraphicBufferConsumer> consumer;
12131213
sp<IGraphicBufferProducer> producer;
12141214
BufferQueue::createBufferQueue(&producer, &consumer);
1215-
consumer->setConsumerName(String8("Virtual disp consumer"));
1215+
consumer->setConsumerName(String8("Virtual disp consumer (MultiDisplayTests)"));
12161216
consumer->setDefaultBufferSize(width, height);
12171217
mProducers.push_back(producer);
12181218

services/surfaceflinger/tests/MultiDisplayLayerBounds_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class MultiDisplayLayerBoundsTest : public LayerTransactionTest {
4747

4848
sp<IGraphicBufferConsumer> consumer;
4949
BufferQueue::createBufferQueue(&mProducer, &consumer);
50-
consumer->setConsumerName(String8("Virtual disp consumer"));
50+
consumer->setConsumerName(String8("Virtual disp consumer (MultiDisplayLayerBounds)"));
5151
consumer->setDefaultBufferSize(mMainDisplayMode.resolution.getWidth(),
5252
mMainDisplayMode.resolution.getHeight());
5353
}

services/surfaceflinger/tests/TransactionTestHarnesses.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,15 @@ class LayerRenderPathTestHarness {
5858
GRALLOC_USAGE_HW_VIDEO_ENCODER | GRALLOC_USAGE_SW_READ_OFTEN);
5959
sp<BufferListener> listener = sp<BufferListener>::make(this);
6060
itemConsumer->setFrameAvailableListener(listener);
61-
itemConsumer->setName(String8("Virtual disp consumer"));
61+
itemConsumer->setName(String8("Virtual disp consumer (TransactionTest)"));
6262
itemConsumer->setDefaultBufferSize(resolution.getWidth(), resolution.getHeight());
6363
#else
6464
sp<IGraphicBufferProducer> producer;
6565
sp<IGraphicBufferConsumer> consumer;
6666
sp<BufferItemConsumer> itemConsumer;
6767
BufferQueue::createBufferQueue(&producer, &consumer);
6868

69-
consumer->setConsumerName(String8("Virtual disp consumer"));
69+
consumer->setConsumerName(String8("Virtual disp consumer (TransactionTest)"));
7070
consumer->setDefaultBufferSize(resolution.getWidth(), resolution.getHeight());
7171

7272
itemConsumer = sp<BufferItemConsumer>::make(consumer,

services/surfaceflinger/tests/VirtualDisplay_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ class VirtualDisplayTest : public ::testing::Test {
2929
void SetUp() override {
3030
#if COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_CONSUMER_BASE_OWNS_BQ)
3131
mGLConsumer = sp<GLConsumer>::make(GLConsumer::TEXTURE_EXTERNAL, true, false, false);
32-
mGLConsumer->setName(String8("Virtual disp consumer"));
32+
mGLConsumer->setName(String8("Virtual disp consumer (VirtualDisplayTest)"));
3333
mGLConsumer->setDefaultBufferSize(100, 100);
3434
mProducer = mGLConsumer->getSurface()->getIGraphicBufferProducer();
3535
#else
3636
sp<IGraphicBufferConsumer> consumer;
3737

3838
BufferQueue::createBufferQueue(&mProducer, &consumer);
39-
consumer->setConsumerName(String8("Virtual disp consumer"));
39+
consumer->setConsumerName(String8("Virtual disp consumer (VirtualDisplayTest)"));
4040
consumer->setDefaultBufferSize(100, 100);
4141

4242
mGLConsumer = sp<GLConsumer>::make(consumer, GLConsumer::TEXTURE_EXTERNAL, true, false);

0 commit comments

Comments
 (0)