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

am f24bed80: Merge "Fix null deref" into mnc-dev

Browse Source 
* commit 'f24bed80e027a2b14652ac9d46900c11312efa6b':
  Fix null deref
This commit is contained in:
John Reck
2015-06-16 20:07:26 +00:00
committed by Android Git Automerger
parent 4c1e8ecf00 f24bed80e0
commit de3799ca16
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); animatorDirtyMask = mAnimatorManager.animate(info);
} }
bool willHaveFunctor = info.mode == TreeInfo::MODE_FULL && mStagingDisplayListData bool willHaveFunctor = false;
? !mStagingDisplayListData->functors.isEmpty() : !mDisplayListData->functors.isEmpty(); if (info.mode == TreeInfo::MODE_FULL && mStagingDisplayListData) {
willHaveFunctor = !mStagingDisplayListData->functors.isEmpty();
} else if (mDisplayListData) {
willHaveFunctor = !mDisplayListData->functors.isEmpty();
}
bool childFunctorsNeedLayer = mProperties.prepareForFunctorPresence( bool childFunctorsNeedLayer = mProperties.prepareForFunctorPresence(
willHaveFunctor, functorsNeedLayer); willHaveFunctor, functorsNeedLayer);