diff options
| author | 2023-11-08 18:41:40 +0000 | |
|---|---|---|
| committer | 2023-11-08 18:41:40 +0000 | |
| commit | f70a4e86c2201295ab29e150183b61ed003ff184 (patch) | |
| tree | 5082e5712e1a910300705d91889e1764cc920217 | |
| parent | 08575afffa634d76772d9518792bb97d81359a9c (diff) | |
| parent | 691b495c705c157f84ffb09779ebb16f5d64ceed (diff) | |
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: d773035f1a am: 691b495c70
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2821330
Change-Id: If8634eda282413883914acb25d570fb549a4bf64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/hwui/renderthread/CanvasContext.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp index f5b3ca602469..618c896afa96 100644 --- a/libs/hwui/renderthread/CanvasContext.cpp +++ b/libs/hwui/renderthread/CanvasContext.cpp @@ -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; |