Commit 691b495c authored Nov 08, 2023 by John Reck Committed by Automerger Merge Worker Nov 08, 2023

Merge "Make active Context valid while buildLayer() When...

Merge "Make active Context valid while buildLayer() When RecordingCanvas::drawPoints() is executed through buildLayer(), active Context is null. It leads to crash" into main am: d773035f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2821330

Change-Id: Iaa1fef32bb164a1353f92c54b97f6b595f72d578
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libs/hwui/renderthread/CanvasContext.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -936,6 +936,7 @@ void CanvasContext::buildLayer(RenderNode* node) {
		// buildLayer() will leave the tree in an unknown state, so we must stop drawing
		stopDrawing();

		ScopedActiveContext activeContext(this);
		TreeInfo info(TreeInfo::MODE_FULL, *this);
		info.damageAccumulator = &mDamageAccumulator;
		info.layerUpdateQueue = &mLayerUpdateQueue;