commit 87edb82d5ca09893c2573217529f31fd23317d08
author Kelvin Zhang <zhangkelvin@google.com> Tue Jun 21 20:00:22 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 21 20:00:22 2022 +0000
tree f3389de6e64e0ce2824a73ed225561856e08dab2
parent 3d6634ad223437d88e522c50262f372150ed5671
parent 384b5c253664aa5252ce47731bad6982b526615c

Merge "Add a wrapper for callers of BootControl HAL" am: ced9514d25 am: 7fb759e5ed am: 384b5c2536

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

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