diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-11-30 22:16:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-11-30 22:16:19 +0000 |
| commit | 1e2b1b5c06d2409a17fd4df4fa31434fb58b8ea1 (patch) | |
| tree | 79ba72bfdf7e072806877511fdd5ad44f313e9e4 | |
| parent | 74ca6abe7824c909092db5d27cb5387f216be9d1 (diff) | |
| parent | d2e4264d5c455d8d3336458a53322c002e8cd8d9 (diff) | |
| download | native-1e2b1b5c06d2409a17fd4df4fa31434fb58b8ea1.tar.gz | |
Merge "Add nullptr check for captureListener in captureScreenCommon" into tm-qpr-dev
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 0e1acb4154..4486e33166 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -6681,8 +6681,10 @@ ftl::SharedFuture<FenceResult> SurfaceFlinger::captureScreenCommon( std::unique_ptr<RenderArea> renderArea = renderAreaFuture.get(); if (!renderArea) { ALOGW("Skipping screen capture because of invalid render area."); - captureResults.result = NO_MEMORY; - captureListener->onScreenCaptureCompleted(captureResults); + if (captureListener) { + captureResults.result = NO_MEMORY; + captureListener->onScreenCaptureCompleted(captureResults); + } return ftl::yield<FenceResult>(base::unexpected(NO_ERROR)).share(); } |