commit 5866b6975f4981d7a95fe7dd4714e776445953a1
author Nolan Scobie <nscobie@google.com> Fri Nov 18 23:19:44 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 18 23:19:44 2022 +0000
tree d819ff827c7f304f276cd429ed3e91fb186987fb
parent c6f2a4f842f97d628735b41f7ca9fb356050583e
parent 1d2deb2b37fc14dadbb1b1ffea90633f06ababcf

Merge "Add nullptr check for captureListener in captureScreenCommon"

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index fad951e..9f26129 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -6387,8 +6387,10 @@
                 std::unique_ptr<RenderArea> renderArea = renderAreaFuture.get();
                 if (!renderArea) {
                     ALOGW("Skipping screen capture because of invalid render area.");
-                    captureResults.fenceResult = base::unexpected(NO_MEMORY);
-                    captureListener->onScreenCaptureCompleted(captureResults);
+                    if (captureListener) {
+                        captureResults.fenceResult = base::unexpected(NO_MEMORY);
+                        captureListener->onScreenCaptureCompleted(captureResults);
+                    }
                     return ftl::yield<FenceResult>(base::unexpected(NO_ERROR)).share();
                 }