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

Commit dc004b3f authored by NT Tsai's avatar NT Tsai Committed by Automerger Merge Worker
Browse files

Merge "Fail gracefully when allocating screenshot buffers" into tm-d1-dev am: 4830cd6a 

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



Change-Id: I044a47f9c43c04472d11dd6d7e87c72b772e846c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e23a168d 4830cd6a

services/surfaceflinger/SurfaceFlinger.cpp

+7 −2
Original line number Diff line number Diff line
@@ -6639,8 +6639,13 @@ ftl::SharedFuture<FenceResult> SurfaceFlinger::captureScreenCommon( 
                                             1 /* layerCount */, usage, "screenshot");



    const status_t bufferStatus = buffer->initCheck();

    LOG_ALWAYS_FATAL_IF(bufferStatus != OK, "captureScreenCommon: Buffer failed to allocate: %d",

                        bufferStatus);

    if (bufferStatus != OK) {

        // Animations may end up being really janky, but don't crash here.

        // Otherwise an irreponsible process may cause an SF crash by allocating

        // too much.

        ALOGE("%s: Buffer failed to allocate: %d", __func__, bufferStatus);

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

    }

    const std::shared_ptr<renderengine::ExternalTexture> texture = std::make_shared<

            renderengine::impl::ExternalTexture>(buffer, getRenderEngine(),

                                                 renderengine::impl::ExternalTexture::Usage::