Let Screenshot Parent get destroyed on the main thread.
Currently the reference to Screenshot Parent is held by the
LayerRenderArea class. That object loses its last reference on the
binder thread so the Screenshot Parent is destroyed on the binder
thread. To keep things consistent, it's best if the Layer is destroyed
on the main thread, like other layers.
By removing the reference to Screenshot Parent in LayerRenderArea and
only having a reference in RenderForDrawing, it ensures that the last
reference to the Screenshot Parent is dropped on the main thread.
Test: Screenshot Parent destructor is called on main thread.
Change-Id: I82f641a063102584d0a2eddb8a6b11546ed777b2
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 488b9ef..c59466e 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -5645,10 +5645,13 @@
drawLayers();
} else {
Rect bounds = getBounds();
- screenshotParentLayer = mFlinger->getFactory().createContainerLayer(
- LayerCreationArgs(mFlinger, nullptr, String8("Screenshot Parent"),
- bounds.getWidth(), bounds.getHeight(), 0,
- LayerMetadata()));
+ // 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"),
+ bounds.getWidth(), bounds.getHeight(), 0,
+ LayerMetadata()));
ReparentForDrawing reparent(mLayer, screenshotParentLayer, sourceCrop);
drawLayers();
@@ -5659,9 +5662,6 @@
const sp<Layer> mLayer;
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;
bool mNeedsFiltering;