commit 2afed434a4636bb9aaaeaa5dd2a1e7c8628ad520
author Shawn Willden <swillden@google.com> Mon Jun 20 02:21:52 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 20 02:21:52 2022 +0000
tree ab60351a9acdec7e8c062e91aa460e361c83587e
parent 651879b0d9a66752ac926dade0146f8cca73a681
parent fbb4cf383a70e3aae4e15fddbcd3f3afc799fe3c

Read VSR level from correct property. am: 35db349596 am: 4e97ec021e am: fbb4cf383a

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

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