commit 54602b48037e1bcece8fbc108cb1cda3f04edab8
author Melody Hsu <melodymhsu@google.com> Sat Mar 30 04:13:18 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Mar 30 04:13:18 2024 +0000
tree bcfc08f4e70c00548ddfbaf6e5e5e0ec0b22181c
parent 23081dae108ebfbf14360664ca701e2fb16b0ba4
parent d96534c47ef132f2da600cd565ed2e3cc12ff7ad

Merge "Add snapshot nullptr check in SF#renderScreenImpl" into main

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 4474355..949a030 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -8295,10 +8295,12 @@
             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();
+            if (snapshot) {
+                display = findDisplay([layerStack = snapshot->outputFilter.layerStack](
+                                              const auto& display) {
+                              return display.getLayerStack() == layerStack;
+                          }).get();
+            }
         }
 
         if (display == nullptr) {