| commit | 9934349cd144f47098a2ef9805a0184a7e39c228 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Feb 23 18:01:57 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 23 18:01:57 2022 +0000 |
| tree | 4be3d02a9b563c0140b5a2dee59f348f03cfd16a | |
| parent | 02184ff333b906e209b8099e474870ca19d3df1c [diff] | |
| parent | a0fb8acaa5f9eef3ddd4e4d7ff3c5c555eaee1eb [diff] |
Merge "getDisplayDecorationSupport test: allow errors" into tm-dev am: a0fb8acaa5 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/16988927 Change-Id: I6cd802c6fa2b54c9ed45236a33cf22c4e9183691
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);