diff options
| author | John Reck <jreck@google.com> | 2015-06-16 20:07:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-16 20:07:26 +0000 |
| commit | de3799ca167dc424e2128dd3a041efaa806dde7c (patch) | |
| tree | ee7589538230454a93eb0dede6487d0255eb1147 | |
| parent | 4c1e8ecf0003f18105819a34e7c182dd9eb64d93 (diff) | |
| parent | f24bed80e027a2b14652ac9d46900c11312efa6b (diff) | |
| download | frameworks_base-de3799ca167dc424e2128dd3a041efaa806dde7c.zip frameworks_base-de3799ca167dc424e2128dd3a041efaa806dde7c.tar.gz frameworks_base-de3799ca167dc424e2128dd3a041efaa806dde7c.tar.bz2 | |
am f24bed80: Merge "Fix null deref" into mnc-dev
* commit 'f24bed80e027a2b14652ac9d46900c11312efa6b':
Fix null deref
| -rw-r--r-- | libs/hwui/RenderNode.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp index b4cbc36..fc18491 100644 --- a/libs/hwui/RenderNode.cpp +++ b/libs/hwui/RenderNode.cpp @@ -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); |