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

This commit is contained in:
TreeHugger Robot
2022-02-23 17:31:08 +00:00
committed by Android (Google) Code Review

View File

@@ -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);