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

Commit a0fb8aca authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "getDisplayDecorationSupport test: allow errors" into tm-dev

parents b3a4a1b1 91590879
Loading
Loading
Loading
Loading
+1 −3
Original line number Diff line number Diff line
@@ -1627,10 +1627,8 @@ TEST_P(GraphicsComposerAidlCommandTest, DisplayDecoration) {

        const auto [error, support] =
                mComposerClient->getDisplayDecorationSupport(display.getDisplayId());
        EXPECT_TRUE(error.isOk());

        const auto format =
                support ? support->format
        const auto format = (error.isOk() && support) ? support->format
                        : aidl::android::hardware::graphics::common::PixelFormat::RGBA_8888;
        const auto decorBuffer = allocate(static_cast<::android::PixelFormat>(format));
        ASSERT_NE(nullptr, decorBuffer);