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

Commit 9934349c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I6cd802c6fa2b54c9ed45236a33cf22c4e9183691
parents 02184ff3 a0fb8aca

graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/VtsHalGraphicsComposer3_TargetTest.cpp

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