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

Commit 1de51596 authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Android (Google) Code Review
Browse files

Merge "Let Screenshot Parent get destroyed on the main thread."

parents 26b99680 32811fd0

services/surfaceflinger/SurfaceFlinger.cpp

+7 −7
Original line number Original line Diff line number Diff line
@@ -5655,7 +5655,10 @@ status_t SurfaceFlinger::captureLayers( 
                drawLayers();

                drawLayers();

            } else {

            } else {

                Rect bounds = getBounds();

                Rect bounds = getBounds();

                screenshotParentLayer = mFlinger->getFactory().createContainerLayer(

                // In the "childrenOnly" case we reparent the children to a screenshot

                // layer which has no properties set and which does not draw.

                sp<ContainerLayer> screenshotParentLayer =

                        mFlinger->getFactory().createContainerLayer(

                                LayerCreationArgs(mFlinger, nullptr, String8("Screenshot Parent"),

                                LayerCreationArgs(mFlinger, nullptr, String8("Screenshot Parent"),

                                                  bounds.getWidth(), bounds.getHeight(), 0,

                                                  bounds.getWidth(), bounds.getHeight(), 0,

                                                  LayerMetadata()));

                                                  LayerMetadata()));
@@ -5669,9 +5672,6 @@ status_t SurfaceFlinger::captureLayers( 
        const sp<Layer> mLayer;

        const sp<Layer> mLayer;

        const Rect mCrop;

        const Rect mCrop;





        // In the "childrenOnly" case we reparent the children to a screenshot

        // layer which has no properties set and which does not draw.

        sp<ContainerLayer> screenshotParentLayer;

        ui::Transform mTransform;

        ui::Transform mTransform;

        bool mNeedsFiltering;

        bool mNeedsFiltering;