diff options
| author | Chris Craik <ccraik@google.com> | 2013-02-23 00:42:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-23 00:42:53 +0000 |
| commit | fb6806570911851fb8cbaaf5bdf275a89f3c3ef4 (patch) | |
| tree | 984f0580e2c6a527635b8100a5391c82288bb2b8 /libs | |
| parent | dd8697c095272f19ddad214834a490b00f11a477 (diff) | |
| parent | ba868c3e2297bd75cd3f8bb1f9eaa286855a1919 (diff) | |
| download | frameworks_base-fb6806570911851fb8cbaaf5bdf275a89f3c3ef4.zip frameworks_base-fb6806570911851fb8cbaaf5bdf275a89f3c3ef4.tar.gz frameworks_base-fb6806570911851fb8cbaaf5bdf275a89f3c3ef4.tar.bz2 | |
Merge "Add deferredList null check"
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/DisplayList.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libs/hwui/DisplayList.cpp b/libs/hwui/DisplayList.cpp index 744edca..bdd539e 100644 --- a/libs/hwui/DisplayList.cpp +++ b/libs/hwui/DisplayList.cpp @@ -381,8 +381,10 @@ status_t DisplayList::setViewProperties(OpenGLRenderer& renderer, Rect& dirty, } } if (mAlpha < 1 && !mCaching) { - // flush since we'll either enter a Layer, or set alpha, both not supported in deferral - status |= deferredList->flush(renderer, dirty, flags, level); + if (deferredList) { + // flush since we'll either enter a Layer, or set alpha, both not supported in deferral + status |= deferredList->flush(renderer, dirty, flags, level); + } if (!mHasOverlappingRendering) { renderer.setAlpha(mAlpha); @@ -399,7 +401,7 @@ status_t DisplayList::setViewProperties(OpenGLRenderer& renderer, Rect& dirty, } } if (mClipChildren && !mCaching) { - if (CC_UNLIKELY(!renderer.hasRectToRectTransform())) { + if (deferredList && CC_UNLIKELY(!renderer.hasRectToRectTransform())) { // flush, since clip will likely be a region status |= deferredList->flush(renderer, dirty, flags, level); } |