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

Commit 2223b52a authored by Nolan Scobie's avatar Nolan Scobie Committed by Automerger Merge Worker
Browse files

Merge "Convert ALOGV to ALOGD in various libgui_test cases" into udc-dev am: e61ca52a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/22626016



Change-Id: I0f0d98e9d9eec06289cd87d8c77c107a3bc09166
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c8f0ef8b e61ca52a

libs/gui/tests/BLASTBufferQueue_test.cpp

+3 −3
Original line number Diff line number Diff line
@@ -179,13 +179,13 @@ protected: 
    BLASTBufferQueueTest() {

        const ::testing::TestInfo* const testInfo =

                ::testing::UnitTest::GetInstance()->current_test_info();

        ALOGV("Begin test: %s.%s", testInfo->test_case_name(), testInfo->name());

        ALOGD("Begin test: %s.%s", testInfo->test_case_name(), testInfo->name());

    }



    ~BLASTBufferQueueTest() {

        const ::testing::TestInfo* const testInfo =

                ::testing::UnitTest::GetInstance()->current_test_info();

        ALOGV("End test:   %s.%s", testInfo->test_case_name(), testInfo->name());

        ALOGD("End test:   %s.%s", testInfo->test_case_name(), testInfo->name());

    }



    void SetUp() {
@@ -206,7 +206,7 @@ protected: 
        const ui::Size& resolution = displayState.layerStackSpaceRect;

        mDisplayWidth = resolution.getWidth();

        mDisplayHeight = resolution.getHeight();

        ALOGV("Display: %dx%d orientation:%d", mDisplayWidth, mDisplayHeight,

        ALOGD("Display: %dx%d orientation:%d", mDisplayWidth, mDisplayHeight,

              displayState.orientation);



        mSurfaceControl = mClient->createSurface(String8("TestSurface"), mDisplayWidth,

libs/gui/tests/BufferItemConsumer_test.cpp

+5 −5
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ class BufferItemConsumerTest : public ::testing::Test { 
    void HandleBufferFreed() {

        std::lock_guard<std::mutex> lock(mMutex);

        mFreedBufferCount++;

        ALOGV("HandleBufferFreed, mFreedBufferCount=%d", mFreedBufferCount);

        ALOGD("HandleBufferFreed, mFreedBufferCount=%d", mFreedBufferCount);

    }



    void DequeueBuffer(int* outSlot) {
@@ -80,7 +80,7 @@ class BufferItemConsumerTest : public ::testing::Test { 
                                                nullptr, nullptr);

        ASSERT_GE(ret, 0);



        ALOGV("dequeueBuffer: slot=%d", slot);

        ALOGD("dequeueBuffer: slot=%d", slot);

        if (ret & IGraphicBufferProducer::BUFFER_NEEDS_REALLOCATION) {

            ret = mProducer->requestBuffer(slot, &mBuffers[slot]);

            ASSERT_EQ(NO_ERROR, ret);
@@ -89,7 +89,7 @@ class BufferItemConsumerTest : public ::testing::Test { 
    }



    void QueueBuffer(int slot) {

        ALOGV("enqueueBuffer: slot=%d", slot);

        ALOGD("enqueueBuffer: slot=%d", slot);

        IGraphicBufferProducer::QueueBufferInput bufferInput(

            0ULL, true, HAL_DATASPACE_UNKNOWN, Rect::INVALID_RECT,

            NATIVE_WINDOW_SCALING_MODE_FREEZE, 0, Fence::NO_FENCE);
@@ -104,12 +104,12 @@ class BufferItemConsumerTest : public ::testing::Test { 
        status_t ret = mBIC->acquireBuffer(&buffer, 0, false);

        ASSERT_EQ(NO_ERROR, ret);



        ALOGV("acquireBuffer: slot=%d", buffer.mSlot);

        ALOGD("acquireBuffer: slot=%d", buffer.mSlot);

        *outSlot = buffer.mSlot;

    }



    void ReleaseBuffer(int slot) {

        ALOGV("releaseBuffer: slot=%d", slot);

        ALOGD("releaseBuffer: slot=%d", slot);

        BufferItem buffer;

        buffer.mSlot = slot;

        buffer.mGraphicBuffer = mBuffers[slot];

libs/gui/tests/BufferQueue_test.cpp

+2 −2
Original line number Diff line number Diff line
@@ -49,14 +49,14 @@ protected: 
    BufferQueueTest() {

        const ::testing::TestInfo* const testInfo =

            ::testing::UnitTest::GetInstance()->current_test_info();

        ALOGV("Begin test: %s.%s", testInfo->test_case_name(),

        ALOGD("Begin test: %s.%s", testInfo->test_case_name(),

                testInfo->name());

    }



    ~BufferQueueTest() {

        const ::testing::TestInfo* const testInfo =

            ::testing::UnitTest::GetInstance()->current_test_info();

        ALOGV("End test:   %s.%s", testInfo->test_case_name(),

        ALOGD("End test:   %s.%s", testInfo->test_case_name(),

                testInfo->name());

    }

libs/gui/tests/CpuConsumer_test.cpp

+10 −10
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ protected: 
        const ::testing::TestInfo* const test_info =

                ::testing::UnitTest::GetInstance()->current_test_info();

        CpuConsumerTestParams params = GetParam();

        ALOGV("** Starting test %s (%d x %d, %d, 0x%x)",

        ALOGD("** Starting test %s (%d x %d, %d, 0x%x)",

                test_info->name(),

                params.width, params.height,

                params.maxLockedBuffers, params.format);
@@ -582,7 +582,7 @@ TEST_P(CpuConsumerTest, FromCpuManyInQueue) { 
    uint32_t stride[numInQueue];



    for (int i = 0; i < numInQueue; i++) {

        ALOGV("Producing frame %d", i);

        ALOGD("Producing frame %d", i);

        ASSERT_NO_FATAL_FAILURE(produceOneFrame(mANW, params, time[i],

                        &stride[i]));

    }
@@ -590,7 +590,7 @@ TEST_P(CpuConsumerTest, FromCpuManyInQueue) { 
    // Consume



    for (int i = 0; i < numInQueue; i++) {

        ALOGV("Consuming frame %d", i);

        ALOGD("Consuming frame %d", i);

        CpuConsumer::LockedBuffer b;

        err = mCC->lockNextBuffer(&b);

        ASSERT_NO_ERROR(err, "getNextBuffer error: ");
@@ -624,7 +624,7 @@ TEST_P(CpuConsumerTest, FromCpuLockMax) { 
    uint32_t stride;



    for (int i = 0; i < params.maxLockedBuffers + 1; i++) {

        ALOGV("Producing frame %d", i);

        ALOGD("Producing frame %d", i);

        ASSERT_NO_FATAL_FAILURE(produceOneFrame(mANW, params, time,

                        &stride));

    }
@@ -633,7 +633,7 @@ TEST_P(CpuConsumerTest, FromCpuLockMax) { 


    std::vector<CpuConsumer::LockedBuffer> b(params.maxLockedBuffers);

    for (int i = 0; i < params.maxLockedBuffers; i++) {

        ALOGV("Locking frame %d", i);

        ALOGD("Locking frame %d", i);

        err = mCC->lockNextBuffer(&b[i]);

        ASSERT_NO_ERROR(err, "getNextBuffer error: ");
@@ -647,16 +647,16 @@ TEST_P(CpuConsumerTest, FromCpuLockMax) { 
        checkAnyBuffer(b[i], GetParam().format);

    }



    ALOGV("Locking frame %d (too many)", params.maxLockedBuffers);

    ALOGD("Locking frame %d (too many)", params.maxLockedBuffers);

    CpuConsumer::LockedBuffer bTooMuch;

    err = mCC->lockNextBuffer(&bTooMuch);

    ASSERT_TRUE(err == NOT_ENOUGH_DATA) << "Allowing too many locks";



    ALOGV("Unlocking frame 0");

    ALOGD("Unlocking frame 0");

    err = mCC->unlockBuffer(b[0]);

    ASSERT_NO_ERROR(err, "Could not unlock buffer 0: ");



    ALOGV("Locking frame %d (should work now)", params.maxLockedBuffers);

    ALOGD("Locking frame %d (should work now)", params.maxLockedBuffers);

    err = mCC->lockNextBuffer(&bTooMuch);

    ASSERT_NO_ERROR(err, "Did not allow new lock after unlock");
@@ -669,11 +669,11 @@ TEST_P(CpuConsumerTest, FromCpuLockMax) { 


    checkAnyBuffer(bTooMuch, GetParam().format);



    ALOGV("Unlocking extra buffer");

    ALOGD("Unlocking extra buffer");

    err = mCC->unlockBuffer(bTooMuch);

    ASSERT_NO_ERROR(err, "Could not unlock extra buffer: ");



    ALOGV("Locking frame %d (no more available)", params.maxLockedBuffers + 1);

    ALOGD("Locking frame %d (no more available)", params.maxLockedBuffers + 1);

    err = mCC->lockNextBuffer(&b[0]);

    ASSERT_EQ(BAD_VALUE, err) << "Not out of buffers somehow";

libs/gui/tests/GLTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ static int abs(int value) { 
void GLTest::SetUp() {

    const ::testing::TestInfo* const testInfo =

        ::testing::UnitTest::GetInstance()->current_test_info();

    ALOGV("Begin test: %s.%s", testInfo->test_case_name(), testInfo->name());

    ALOGD("Begin test: %s.%s", testInfo->test_case_name(), testInfo->name());



    mEglDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);

    ASSERT_EQ(EGL_SUCCESS, eglGetError());
@@ -135,7 +135,7 @@ void GLTest::TearDown() { 


    const ::testing::TestInfo* const testInfo =

        ::testing::UnitTest::GetInstance()->current_test_info();

    ALOGV("End test:   %s.%s", testInfo->test_case_name(), testInfo->name());

    ALOGD("End test:   %s.%s", testInfo->test_case_name(), testInfo->name());

}



EGLint const* GLTest::getConfigAttribs() {