From 8c75b834f4267d4e46c52ebc84425c087e2c355f Mon Sep 17 00:00:00 2001
From: Midas Chien <midaschieh@google.com>
Date: Tue, 7 Jun 2022 02:32:28 +0800
Subject: [PATCH] composer: vts: configure layer for DisplayDecoration

Some HW may not support crop function for decoration and current API
can't query this capability. Configure decoration layer to full screen
to avoid this limitation.

Bug: 225765061
Test: VtsHalGraphicsComposer3_TargetTest
--gtest_filter=*DisplayDecoration*

Change-Id: If47154adf9d48f9c1b8390b4bee090d8bf40ff3b
(cherry picked from commit 7d55d4269d5ec7247c00f9f1a84c33a6d6f53a00)
Merged-In: If47154adf9d48f9c1b8390b4bee090d8bf40ff3b
(cherry picked from commit 308f4ac90690febbac077c297302890772ada495)
Merged-In: If47154adf9d48f9c1b8390b4bee090d8bf40ff3b
---
 .../composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp b/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp
index 759bfecca3..047109e35f 100644
--- a/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp
+++ b/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp
@@ -1719,10 +1719,10 @@ TEST_P(GraphicsComposerAidlCommandTest, DisplayDecoration) {
             }
         }
 
+        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) {