Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29b68a5b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add nullptr check for captureListener in captureScreenCommon" into tm-qpr-dev am: 1e2b1b5c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/20515550



Change-Id: Id7732aea9c1dc1098ee6d02a0243ceebb313e734
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c27a7c5b 1e2b1b5c

services/surfaceflinger/SurfaceFlinger.cpp

+4 −2
Original line number Diff line number Diff line
@@ -6693,8 +6693,10 @@ ftl::SharedFuture<FenceResult> SurfaceFlinger::captureScreenCommon( 
        std::unique_ptr<RenderArea> renderArea = renderAreaFuture.get();

        if (!renderArea) {

            ALOGW("Skipping screen capture because of invalid render area.");

            if (captureListener) {

                captureResults.result = NO_MEMORY;

                captureListener->onScreenCaptureCompleted(captureResults);

            }

            return ftl::yield<FenceResult>(base::unexpected(NO_ERROR)).share();

        }