commit bab12f55a09ba16feb19cc588635e5395a4290f0
author Melody Hsu <melodymhsu@google.com> Wed Mar 27 08:39:08 2024 +0000
committer Melody Hsu <melodymhsu@google.com> Thu Mar 28 17:29:20 2024 +0000
tree 618faa5063c6a2353b248fee4d134c03812c1c3b
parent 3fa9d8501e249f5b696adbd11a4b61252340a148

Change how layer stack is acquired in SF#renderScreenImpl

Update how we get the layer stack from the legacy layer.
This is part of an overall cleanup to reduce using the legacy layer
so that it can eventually be removed.

Bug: b/330785038
Test: presubmit
Change-Id: I84e31ee29fa76db112838769660a5e126c81a326

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index cf94f94..b6e2632 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -8279,7 +8279,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();
         }