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

Commit f24bed80 authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Fix null deref" into mnc-dev

parents 27a88a3e 3f725f0a

libs/hwui/RenderNode.cpp

+6 −2
Original line number Diff line number Diff line
@@ -241,8 +241,12 @@ void RenderNode::prepareTreeImpl(TreeInfo& info, bool functorsNeedLayer) { 
        animatorDirtyMask = mAnimatorManager.animate(info);

    }



    bool willHaveFunctor = info.mode == TreeInfo::MODE_FULL && mStagingDisplayListData

            ? !mStagingDisplayListData->functors.isEmpty() : !mDisplayListData->functors.isEmpty();

    bool willHaveFunctor = false;

    if (info.mode == TreeInfo::MODE_FULL && mStagingDisplayListData) {

        willHaveFunctor = !mStagingDisplayListData->functors.isEmpty();

    } else if (mDisplayListData) {

        willHaveFunctor = !mDisplayListData->functors.isEmpty();

    }

    bool childFunctorsNeedLayer = mProperties.prepareForFunctorPresence(

            willHaveFunctor, functorsNeedLayer);