commit f9fff0db59b20b15a601a2fff43a74573900fced
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jun 23 04:27:14 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 23 04:27:14 2022 +0000
tree 1638543c6bb06cb9225321e138af25835070268d
parent bb2a6f8a6c18f0acc431493c4d506ad923e389ab
parent b88eeebd37f54c036362ea11d5049f6deead539a

[automerger skipped] [conflict] Merge "vts: fix some tunerhal vts fail without frontend device" into android11-tests-dev am: 6807799ad9 am: 88b7c10cd8 -s ours am: b22f548965 -s ours am: ff2429050c -s ours am: d3d375746c -s ours am: b88eeebd37 -s ours

am skip reason: skipped by user hgchen

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

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