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

Commit 51c51df4 authored by John Reck's avatar John Reck
Browse files

Add missing nothingToDraw() check 

Fixes: 34598346

Prior to 2874daa4 we
never freed the resources of root nodes. Now that this is being
done we need to ensure that the backdrop has content before
we try to draw that content. All other nodes passed in
deferRenderNodeScene check that nothingToDraw() returns false
before drawing them, but that check was missed on the backdrop
node.

Test: manual. open calculator then long-press on recents
Change-Id: I495749161b38b57278bdb60d5f872eeeb2b218d0
parent 34f04ffa

libs/hwui/FrameBuilder.cpp

+12 −10
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ void FrameBuilder::deferRenderNodeScene(const std::vector< sp<RenderNode> >& nod 
        }

    }



    if (!nodes[1]->nothingToDraw()) {

        if (!backdrop.isEmpty()) {

            // content node translation to catch up with backdrop

            float dx = contentDrawBounds.left - backdrop.left;
@@ -191,6 +192,7 @@ void FrameBuilder::deferRenderNodeScene(const std::vector< sp<RenderNode> >& nod 
        } else {

            deferRenderNode(*nodes[1]);

        }

    }



    // remaining overlay nodes, simply defer

    for (size_t index = 2; index < nodes.size(); index++) {