commit 127514b535e3ac313775e7ab3ace6636e734e4ce
author Midas Chien <midaschieh@google.com> Thu Jun 09 07:59:49 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 09 07:59:49 2022 +0000
tree 19b994be288507b78e9ceb3ef5bc1d0c5d90b693
parent 8aa69cf87365c9fecb606213fb60e30ee63c334d
parent 3ebbea4dc2c2e1ba6f989bfb5b2426c8e044c4c1

Merge "composer: vts: configure layer for DisplayDecoration" into tm-d1-dev am: 3ebbea4dc2

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

Change-Id: Ifd83d8537aa96ce1819734e5bbdb37f5d05fcf1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp

diff --git a/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp b/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp
index 759bfec..047109e 100644
--- a/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp
+++ b/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp
@@ -1719,10 +1719,10 @@
             }
         }
 
+        configureLayer(display, layer, Composition::DISPLAY_DECORATION, display.getFrameRect(),
+                          display.getCrop());
         mWriter.setLayerBuffer(display.getDisplayId(), layer, /*slot*/ 0, decorBuffer->handle,
                                /*acquireFence*/ -1);
-        mWriter.setLayerCompositionType(display.getDisplayId(), layer,
-                                        Composition::DISPLAY_DECORATION);
         mWriter.validateDisplay(display.getDisplayId(), ComposerClientWriter::kNoTimestamp);
         execute();
         if (support) {