commit 787d302b3bc74c1fa9c36da5550c5b0ea9f05c3a
author Melody Hsu <melodymhsu@google.com> Sun Mar 03 07:35:38 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sun Mar 03 07:35:38 2024 +0000
tree dbd507f02cd0ee03acba08f2387ddb4cb3c02201
parent b43b58378679bf4ac8d0837047187d4509bc45d8

Revert "Refactor of screenshot code on main thread."

This reverts commit b43b58378679bf4ac8d0837047187d4509bc45d8.

Reason for revert: Appstartup regression found in b/327488235

Change-Id: I8d975b81afd2cde1d543e8bc7e730a6e42393bec

services/surfaceflinger/RegionSamplingThread.cpp

diff --git a/services/surfaceflinger/RegionSamplingThread.cpp b/services/surfaceflinger/RegionSamplingThread.cpp
index 77e045d..c888ccc 100644
--- a/services/surfaceflinger/RegionSamplingThread.cpp
+++ b/services/surfaceflinger/RegionSamplingThread.cpp
@@ -377,8 +377,8 @@
     constexpr bool kIsProtected = false;
 
     if (const auto fenceResult =
-                mFlinger.captureScreenshot(std::move(renderAreaFuture), getLayerSnapshots, buffer,
-                                           kRegionSampling, kGrayscale, kIsProtected, nullptr)
+                mFlinger.captureScreenCommon(std::move(renderAreaFuture), getLayerSnapshots, buffer,
+                                             kRegionSampling, kGrayscale, kIsProtected, nullptr)
                         .get();
         fenceResult.ok()) {
         fenceResult.value()->waitForever(LOG_TAG);