Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2ab5be9 authored by Jim Shargo's avatar Jim Shargo
Browse files

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
parent 918fc164

libs/gui/tests/EndToEndNativeInputTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1212,7 +1212,7 @@ public: 
        sp<IGraphicBufferConsumer> consumer;

        sp<IGraphicBufferProducer> producer;

        BufferQueue::createBufferQueue(&producer, &consumer);

        consumer->setConsumerName(String8("Virtual disp consumer"));

        consumer->setConsumerName(String8("Virtual disp consumer (MultiDisplayTests)"));

        consumer->setDefaultBufferSize(width, height);

        mProducers.push_back(producer);

services/surfaceflinger/tests/MultiDisplayLayerBounds_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ protected: 


        sp<IGraphicBufferConsumer> consumer;

        BufferQueue::createBufferQueue(&mProducer, &consumer);

        consumer->setConsumerName(String8("Virtual disp consumer"));

        consumer->setConsumerName(String8("Virtual disp consumer (MultiDisplayLayerBounds)"));

        consumer->setDefaultBufferSize(mMainDisplayMode.resolution.getWidth(),

                                       mMainDisplayMode.resolution.getHeight());

    }

services/surfaceflinger/tests/TransactionTestHarnesses.h

+2 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ public: 
                        GRALLOC_USAGE_HW_VIDEO_ENCODER | GRALLOC_USAGE_SW_READ_OFTEN);

                sp<BufferListener> listener = sp<BufferListener>::make(this);

                itemConsumer->setFrameAvailableListener(listener);

                itemConsumer->setName(String8("Virtual disp consumer"));

                itemConsumer->setName(String8("Virtual disp consumer (TransactionTest)"));

                itemConsumer->setDefaultBufferSize(resolution.getWidth(), resolution.getHeight());

#else

                sp<IGraphicBufferProducer> producer;
@@ -66,7 +66,7 @@ public: 
                sp<BufferItemConsumer> itemConsumer;

                BufferQueue::createBufferQueue(&producer, &consumer);



                consumer->setConsumerName(String8("Virtual disp consumer"));

                consumer->setConsumerName(String8("Virtual disp consumer (TransactionTest)"));

                consumer->setDefaultBufferSize(resolution.getWidth(), resolution.getHeight());



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

services/surfaceflinger/tests/VirtualDisplay_test.cpp

+2 −2
Original line number Diff line number Diff line
@@ -29,14 +29,14 @@ protected: 
    void SetUp() override {

#if COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_CONSUMER_BASE_OWNS_BQ)

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

        mGLConsumer->setName(String8("Virtual disp consumer"));

        mGLConsumer->setName(String8("Virtual disp consumer (VirtualDisplayTest)"));

        mGLConsumer->setDefaultBufferSize(100, 100);

        mProducer = mGLConsumer->getSurface()->getIGraphicBufferProducer();

#else

        sp<IGraphicBufferConsumer> consumer;



        BufferQueue::createBufferQueue(&mProducer, &consumer);

        consumer->setConsumerName(String8("Virtual disp consumer"));

        consumer->setConsumerName(String8("Virtual disp consumer (VirtualDisplayTest)"));

        consumer->setDefaultBufferSize(100, 100);



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