diff options
| author | 2023-11-08 19:25:47 +0000 | |
|---|---|---|
| committer | 2023-11-08 19:25:47 +0000 | |
| commit | 7bf43433c6a8474ddfa2e09d0604314fe848c3eb (patch) | |
| tree | e6bfcd00eb3944e195e92fd4390988e93017dba1 /libs | |
| parent | 0edd84716a9090da9a35837353ccb7344d5b8608 (diff) | |
| parent | f70a4e86c2201295ab29e150183b61ed003ff184 (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 am: f70a4e86c2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2821330
Change-Id: Idd22c5919c84e48c79f4606803ed061f04e353c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs')
| -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 7fac0c9776ac..9e3bb79f03f3 100644 --- a/libs/hwui/renderthread/CanvasContext.cpp +++ b/libs/hwui/renderthread/CanvasContext.cpp @@ -969,6 +969,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; |