From 01c31167ce5880ec5f6f97ac82c81c85c9807f19 Mon Sep 17 00:00:00 2001
From: Patrick Williams <pdwilliams@google.com>
Date: Mon, 14 Nov 2022 17:45:19 +0000
Subject: SF: Fix use after move bug in screen capture refactor

Bug: 238643986
Test: presubmits
Change-Id: I1ff3d214eafcf02a1a50e2dc80a0ff4c01807aaf
---
 services/surfaceflinger/ScreenCaptureOutput.cpp | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

(limited to 'services/surfaceflinger/ScreenCaptureOutput.cpp')

diff --git a/services/surfaceflinger/ScreenCaptureOutput.cpp b/services/surfaceflinger/ScreenCaptureOutput.cpp
index 8f93ba40ee..37b3218138 100644
--- a/services/surfaceflinger/ScreenCaptureOutput.cpp
+++ b/services/surfaceflinger/ScreenCaptureOutput.cpp
@@ -24,10 +24,16 @@
 
 namespace android {
 
-std::shared_ptr<ScreenCaptureOutput> createScreenCaptureOutput(ScreenCaptureOutputArgs&& args) {
+std::shared_ptr<ScreenCaptureOutput> createScreenCaptureOutput(ScreenCaptureOutputArgs args) {
     std::shared_ptr<ScreenCaptureOutput> output = compositionengine::impl::createOutputTemplated<
-            ScreenCaptureOutput, compositionengine::CompositionEngine,
-            ScreenCaptureOutputArgs&&>(args.compositionEngine, std::move(args));
+            ScreenCaptureOutput, compositionengine::CompositionEngine, const RenderArea&,
+            std::unordered_set<compositionengine::LayerFE*>,
+            const compositionengine::Output::ColorProfile&, bool>(args.compositionEngine,
+                                                                  args.renderArea,
+                                                                  std::move(
+                                                                          args.filterForScreenshot),
+                                                                  args.colorProfile,
+                                                                  args.regionSampling);
     output->editState().isSecure = args.renderArea.isSecure();
     output->setCompositionEnabled(true);
     output->setLayerFilter({args.layerStack});
@@ -50,11 +56,14 @@ std::shared_ptr<ScreenCaptureOutput> createScreenCaptureOutput(ScreenCaptureOutp
     return output;
 }
 
-ScreenCaptureOutput::ScreenCaptureOutput(ScreenCaptureOutputArgs&& args)
-      : mRenderArea(args.renderArea),
-        mFilterForScreenshot(std::move(args.filterForScreenshot)),
-        mColorProfile(args.colorProfile),
-        mRegionSampling(args.regionSampling) {}
+ScreenCaptureOutput::ScreenCaptureOutput(
+        const RenderArea& renderArea,
+        std::unordered_set<compositionengine::LayerFE*> filterForScreenshot,
+        const compositionengine::Output::ColorProfile& colorProfile, bool regionSampling)
+      : mRenderArea(renderArea),
+        mFilterForScreenshot(std::move(filterForScreenshot)),
+        mColorProfile(colorProfile),
+        mRegionSampling(regionSampling) {}
 
 void ScreenCaptureOutput::updateColorProfile(const compositionengine::CompositionRefreshArgs&) {
     auto& outputState = editState();
-- 
cgit v1.2.3-59-g8ed1b