| commit | a0fb8acaa5f9eef3ddd4e4d7ff3c5c555eaee1eb | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Feb 23 17:31:08 2022 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Feb 23 17:31:08 2022 +0000 |
| tree | 4be3d02a9b563c0140b5a2dee59f348f03cfd16a | |
| parent | b3a4a1b11e429cbe17c02192df39f472a7d4a6d5 [diff] | |
| parent | 915908797a04d11449f7c9bdaefc5e4ce327d0ad [diff] |
Merge "getDisplayDecorationSupport test: allow errors" into tm-dev
diff --git a/graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/VtsHalGraphicsComposer3_TargetTest.cpp b/graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/VtsHalGraphicsComposer3_TargetTest.cpp index f327381..35242c2 100644 --- a/graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/VtsHalGraphicsComposer3_TargetTest.cpp +++ b/graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/VtsHalGraphicsComposer3_TargetTest.cpp
@@ -1627,10 +1627,8 @@ 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);