From c85693d02db99e5eb4ffd4c6464a4aca201c26a2 Mon Sep 17 00:00:00 2001
From: Brian Lindahl <blindahl@google.com>
Date: Fri, 31 Mar 2023 07:31:51 -0600
Subject: [PATCH] Fix bug where buffer slots to clear were not set correctly

Bug: 276417624
Bug: 258196272
Test: VtsHalGraphicsComposer3_TargetTest
Change-Id: Ie077f14140d71f88a497c4a8995d73dd07c31598
---
 .../hardware/graphics/composer3/ComposerClientWriter.h      | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/graphics/composer/aidl/include/android/hardware/graphics/composer3/ComposerClientWriter.h b/graphics/composer/aidl/include/android/hardware/graphics/composer3/ComposerClientWriter.h
index 22020c0ea9..4a5ac69f2f 100644
--- a/graphics/composer/aidl/include/android/hardware/graphics/composer3/ComposerClientWriter.h
+++ b/graphics/composer/aidl/include/android/hardware/graphics/composer3/ComposerClientWriter.h
@@ -144,10 +144,8 @@ class ComposerClientWriter final {
 
     void setLayerBufferSlotsToClear(int64_t display, int64_t layer,
                                     const std::vector<uint32_t>& slotsToClear) {
-        LayerCommand& layerCommand = getLayerCommand(display, layer);
-        for (auto slot : slotsToClear) {
-            layerCommand.bufferSlotsToClear.emplace(static_cast<int32_t>(slot));
-        }
+        getLayerCommand(display, layer)
+                .bufferSlotsToClear.emplace(slotsToClear.begin(), slotsToClear.end());
     }
 
     void setLayerSurfaceDamage(int64_t display, int64_t layer, const std::vector<Rect>& damage) {