summaryrefslogtreecommitdiff
path: root/libs/hwui/Layer.cpp
diff options
context:
space:
mode:
author Chris Craik <ccraik@google.com> 2013-06-17 20:16:37 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2013-06-17 20:16:37 +0000
commit61e1ca68fa82e5228b5bfcdad8deecd9383fb183 (patch)
tree8720959ea3bf316d06cd65bba871b79f17aa4c70 /libs/hwui/Layer.cpp
parent0a1e9611e9d26310642d36b573368affbd1167af (diff)
parent8c6e17c2a9b0ad7864a261cc9a30b9623e20bdcb (diff)
Merge "Check for layer renderer in flush"
Diffstat (limited to 'libs/hwui/Layer.cpp')
-rw-r--r--libs/hwui/Layer.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/hwui/Layer.cpp b/libs/hwui/Layer.cpp
index 7c22bbb6f973..4708af141ec4 100644
--- a/libs/hwui/Layer.cpp
+++ b/libs/hwui/Layer.cpp
@@ -214,7 +214,8 @@ void Layer::defer() {
}
void Layer::flush() {
- if (deferredList) {
+ // renderer is checked as layer may be destroyed/put in layer cache with flush scheduled
+ if (deferredList && renderer) {
renderer->setViewport(layer.getWidth(), layer.getHeight());
renderer->prepareDirty(dirtyRect.left, dirtyRect.top, dirtyRect.right, dirtyRect.bottom,
!isBlend());