commit d76dbbe785649f6953ac77335bbcc93cc086f7c5
author Jooyung Han <jooyung@google.com> Mon Jun 20 02:22:21 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 20 02:22:21 2022 +0000
tree a5d5a1f3039df226e087c80b10e483ee57a1cca1
parent 4bf355157f0f6c6b6f15c72aa4a8b88cbc2824d6
parent 933fac1c298a41091f2dc5abcfd6949174b38b50

[automerger skipped] Merge "Remove AIDL-libs from VNDK" am: c3f8861bb8 am: 51978d40d4 -s ours am: 933fac1c29 -s ours

am skip reason: Merged-In If999df9c78a20df931177da11742b1c5de19bc08 with SHA-1 c0b24f4f13 is already in history

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

Change-Id: If75fff0018102f70c9e129534f3ea1fd1795e059
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) {