commit 8e99dca617f4c8f8dc4b301e68023a976071f7cf
author David Drysdale <drysdale@google.com> Mon Jun 27 12:50:30 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 27 12:50:30 2022 +0000
tree fd674882e012e3ba401c99f442a065c127c858e5
parent c561d8e8efd0408c795a67be2a8cba1b895b6d8a
parent 5ad931e0a657a07c0a1fad74048573395db3e7d3

Merge "KeyMint HALs: clarifications" am: 46f99f4e9a am: ee63e2489a am: 5ad931e0a6

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

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