From 5aadd249f326b21e5ef6cadfebc15b6a0a016816 Mon Sep 17 00:00:00 2001
From: Vishnu Nair <vishnun@google.com>
Date: Sat, 29 Jun 2024 01:17:02 +0000
Subject: Enable single hop screenshots for only threaded re

Fixes a deadlock where screenshot requests are blocked
on the main thread which inturn is blocked by the
screenshot request finishing.

Flag: EXEMPT bug fix
Bug: 349776684
Test: presubmit
Change-Id: Ibf038ad6db3e87c84508d3e101ca1eb144836d7c
---
 services/surfaceflinger/RegionSamplingThread.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/services/surfaceflinger/RegionSamplingThread.cpp b/services/surfaceflinger/RegionSamplingThread.cpp
index 1eb865d600..cd3c638d7c 100644
--- a/services/surfaceflinger/RegionSamplingThread.cpp
+++ b/services/surfaceflinger/RegionSamplingThread.cpp
@@ -354,7 +354,7 @@ void RegionSamplingThread::captureSample() {
 
     FenceResult fenceResult;
     if (FlagManager::getInstance().single_hop_screenshot() &&
-        FlagManager::getInstance().ce_fence_promise()) {
+        FlagManager::getInstance().ce_fence_promise() && mFlinger.mRenderEngine->isThreaded()) {
         std::vector<sp<LayerFE>> layerFEs;
         auto displayState = mFlinger.getSnapshotsFromMainThread(renderAreaBuilder,
                                                                 getLayerSnapshotsFn, layerFEs);
-- 
cgit v1.2.3-59-g8ed1b