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

Commit 4ec1c08c authored by John Reck's avatar John Reck Committed by Automerger Merge Worker
Browse files

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: I9d0d4eef2c471506939cecb78feddb0f3c180783
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 24ab6a5b d773035f

libs/hwui/renderthread/CanvasContext.cpp

+1 −0
Original line number Diff line number Diff line
@@ -918,6 +918,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;