commit 1cf0a50a2e0db8043c8240717875383c77d66b3c
author David Drysdale <drysdale@google.com> Mon Jun 20 07:05:12 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 20 07:05:12 2022 +0000
tree a5d5a1f3039df226e087c80b10e483ee57a1cca1
parent 0dbcd1cd5aa17135f14e3429f804347f123aaf8a
parent c94e96ba1b48c9346ca8ac76132fb60ff2447133

[automerger skipped] KeyMint VTS: cope with ATTEST_KEY +/- SIGN am: cdfb961585 -s ours am: c94e96ba1b -s ours

am skip reason: Merged-In If88642e238e64ca9ec80303a4a72f7171c63464f with SHA-1 4348927562 is already in history

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

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