| commit | 29b68a5b0b2203bc1f84f697767ca7bdc87fe916 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Nov 30 22:41:44 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 30 22:41:44 2022 +0000 |
| tree | e20fc13d9404b1b523590927bdce9832ee6abab1 | |
| parent | c27a7c5bbb5fc77fb4de5781f40ecc3e024640a6 [diff] | |
| parent | 1e2b1b5c06d2409a17fd4df4fa31434fb58b8ea1 [diff] |
Merge "Add nullptr check for captureListener in captureScreenCommon" into tm-qpr-dev am: 1e2b1b5c06 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/20515550 Change-Id: Id7732aea9c1dc1098ee6d02a0243ceebb313e734 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index e228468..79ed7eb 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -6693,8 +6693,10 @@ 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(); }