Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix null deref" into mnc-dev

Browse Source
This commit is contained in:
John Reck
2015-06-16 17:34:27 +00:00
committed by Android (Google) Code Review
parent 27a88a3eb6 3f725f0a5a
commit f24bed80e0
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/hwui/RenderNode.cpp
View File

@@ -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);