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

Commit 50ede7f7 authored by Leon Scroggins's avatar Leon Scroggins Committed by Android (Google) Code Review
Browse files

Merge "Avoid crashing when failing graphics VTS" into main

parents e32ffaec 94f4b20d

graphics/composer/aidl/vts/VtsComposerClient.cpp

+3 −0
Original line number Diff line number Diff line
@@ -68,6 +68,9 @@ bool VtsComposerClient::tearDown(ComposerClientWriter* writer) { 


std::pair<ScopedAStatus, int32_t> VtsComposerClient::getInterfaceVersion() const {

    int32_t version = 1;

    if (!mComposerClient) {

        return {ScopedAStatus{nullptr}, version};

    }

    auto status = mComposerClient->getInterfaceVersion(&version);

    return {std::move(status), version};

}

graphics/composer/aidl/vts/VtsHalGraphicsComposer3_ReadbackTest.cpp

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ class GraphicsCompositionTestBase : public ::testing::Test { 
    }



    void TearDown() override {

        ASSERT_FALSE(mDisplays.empty());

        ASSERT_TRUE(mComposerClient->setPowerMode(getPrimaryDisplayId(), PowerMode::OFF).isOk());

        ASSERT_TRUE(mComposerClient->tearDown(mWriter.get()));

        mComposerClient.reset();

graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1400,6 +1400,7 @@ TEST_P(GraphicsComposerAidlV3Test, NotifyExpectedPresent) { 
class GraphicsComposerAidlCommandTest : public GraphicsComposerAidlTest {

  protected:

    void TearDown() override {

        ASSERT_FALSE(mDisplays.empty());

        const auto errors = mReader.takeErrors();

        ASSERT_TRUE(mReader.takeErrors().empty());

        ASSERT_TRUE(mReader.takeChangedCompositionTypes(getPrimaryDisplayId()).empty());