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

Commit 14fd5ffb authored by Ram Indani's avatar Ram Indani Committed by Automerger Merge Worker
Browse files

Merge "Check Exception Code for Service specific error" into tm-dev am: cb1fd25a am: be6e0a78 

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/17921233



Change-Id: I58d0d9b7c9851ef00c3e7c681dd941abfaaf1f8f
Ignore-AOSP-First: this is an automerge
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 801cc7de be6e0a78

graphics/composer/aidl/vts/VtsHalGraphicsComposer3_ReadbackTest.cpp

+11 −5
Original line number Diff line number Diff line
@@ -109,6 +109,11 @@ class GraphicsCompositionTestBase : public ::testing::Test { 


    int32_t getDisplayHeight() const { return getPrimaryDisplay().getDisplayHeight(); }



    void assertServiceSpecificError(const ScopedAStatus& status, int32_t serviceSpecificError) {

        ASSERT_EQ(status.getExceptionCode(), EX_SERVICE_SPECIFIC);

        ASSERT_EQ(status.getServiceSpecificError(), serviceSpecificError);

    }



    std::pair<bool, ::android::sp<::android::GraphicBuffer>> allocateBuffer(uint32_t usage) {

        const auto width = static_cast<uint32_t>(getDisplayWidth());

        const auto height = static_cast<uint32_t>(getDisplayHeight());
@@ -222,7 +227,8 @@ class GraphicsCompositionTestBase : public ::testing::Test { 
            mDataspace = readBackBufferAttributes.dataspace;

            return ReadbackHelper::readbackSupported(mPixelFormat, mDataspace);

        }

        EXPECT_EQ(IComposerClient::EX_UNSUPPORTED, status.getServiceSpecificError());

        EXPECT_NO_FATAL_FAILURE(

                assertServiceSpecificError(status, IComposerClient::EX_UNSUPPORTED));

        return false;

    }
@@ -458,7 +464,7 @@ TEST_P(GraphicsCompositionTest, SetReadbackBuffer_BadDisplay) { 
            mComposerClient->setReadbackBuffer(getInvalidDisplayId(), bufferHandle, fence);



    EXPECT_FALSE(status.isOk());

    ASSERT_EQ(IComposerClient::EX_BAD_DISPLAY, status.getServiceSpecificError());

    EXPECT_NO_FATAL_FAILURE(assertServiceSpecificError(status, IComposerClient::EX_BAD_DISPLAY));

}



TEST_P(GraphicsCompositionTest, SetReadbackBuffer_BadParameter) {
@@ -475,7 +481,7 @@ TEST_P(GraphicsCompositionTest, SetReadbackBuffer_BadParameter) { 
            mComposerClient->setReadbackBuffer(getPrimaryDisplayId(), &bufferHandle, releaseFence);



    EXPECT_FALSE(status.isOk());

    ASSERT_EQ(IComposerClient::EX_BAD_PARAMETER, status.getServiceSpecificError());

    EXPECT_NO_FATAL_FAILURE(assertServiceSpecificError(status, IComposerClient::EX_BAD_PARAMETER));

}



TEST_P(GraphicsCompositionTest, GetReadbackBufferFenceInactive) {
@@ -490,7 +496,7 @@ TEST_P(GraphicsCompositionTest, GetReadbackBufferFenceInactive) { 
            mComposerClient->getReadbackBufferFence(getPrimaryDisplayId());



    EXPECT_FALSE(status.isOk());

    EXPECT_EQ(IComposerClient::EX_UNSUPPORTED, status.getServiceSpecificError());

    EXPECT_NO_FATAL_FAILURE(assertServiceSpecificError(status, IComposerClient::EX_UNSUPPORTED));

    EXPECT_EQ(-1, releaseFence.get());

}
@@ -1300,7 +1306,7 @@ TEST_P(GraphicsTransformCompositionTest, FLIP_H) { 
    for (ColorMode mode : mTestColorModes) {

        auto status = mComposerClient->setColorMode(getPrimaryDisplayId(), mode,

                                                    RenderIntent::COLORIMETRIC);

        if (!status.isOk() &&

        if (!status.isOk() && status.getExceptionCode() == EX_SERVICE_SPECIFIC &&

            (status.getServiceSpecificError() == IComposerClient::EX_UNSUPPORTED ||

             status.getServiceSpecificError() == IComposerClient::EX_BAD_PARAMETER)) {

            SUCCEED() << "ColorMode not supported, skip test";

graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp

+86 −58

File changed.

Preview size limit exceeded, changes collapsed.