commit b67327ad91203dd3d2986a61e9fc53a16760010d
author Roshan Pius <rpius@google.com> Mon Jun 13 18:11:27 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 13 18:11:27 2022 +0000
tree c4811ea9891578ba009b71f1fde6ec18a6fc9169
parent 325721628d1dcea93462eda985f6763b07b73b24
parent bf83c18a3e2ea493b3c01cfb208b4be2ad912671

Merge "uwb(vts): Close HAL at end of each test" into tm-dev am: 987a7e3f30 am: bf83c18a3e

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

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