commit 025022b09a621c297a23adefd7ba6f6e48235b7e
author Melody Hsu <melodymhsu@google.com> Fri Mar 29 01:13:37 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 29 01:13:37 2024 +0000
tree 5c377a06f71dda1b2814d15e4def7b0f5329307d
parent ea6843b308c4207b2237e91b85ca8b331c637029
parent bab12f55a09ba16feb19cc588635e5395a4290f0

Merge "Change how layer stack is acquired in SF#renderScreenImpl" into main

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index f6ad171..5f36e38 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -8273,7 +8273,11 @@
         Mutex::Autolock lock(mStateLock);
         const DisplayDevice* display = nullptr;
         if (parent) {
-            display = findDisplay([layerStack = parent->getLayerStack()](const auto& display) {
+            const frontend::LayerSnapshot* snapshot = mLayerLifecycleManagerEnabled
+                    ? mLayerSnapshotBuilder.getSnapshot(parent->sequence)
+                    : parent->getLayerSnapshot();
+            display = findDisplay([layerStack =
+                                           snapshot->outputFilter.layerStack](const auto& display) {
                           return display.getLayerStack() == layerStack;
                       }).get();
         }