commit 0dbcd1cd5aa17135f14e3429f804347f123aaf8a
author Shawn Willden <swillden@google.com> Mon Jun 20 07:05:05 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 20 07:05:05 2022 +0000
tree a5d5a1f3039df226e087c80b10e483ee57a1cca1
parent d76dbbe785649f6953ac77335bbcc93cc086f7c5
parent 2121b71c747060e0727e44eec1ebef0e16c8d993

[automerger skipped] Read VSR level from correct property. am: e5364d7617 -s ours am: 2121b71c74 -s ours

am skip reason: Merged-In I39109c097d129124097a303c3f108d015cb367e3 with SHA-1 35db349596 is already in history

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

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