summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chris Craik <ccraik@google.com> 2014-02-12 13:44:47 -0800
committer Chris Craik <ccraik@google.com> 2014-02-12 13:45:52 -0800
commit637314d15c2dacc2d5daeecf17dc668ce405b25c (patch)
treea26b85db86fb0a3bc9125d7357186b4080d3056f
parent5f97e9e9ed2a6da22a6ed90b8db11052dd6a8cd7 (diff)
Avoid crash if layer is destroyed after GLRenderer
bug:12988766 Change-Id: I96961aeef0b1d42ae8c609f1607a100e61a3d593
-rw-r--r--core/java/android/view/GLRenderer.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/view/GLRenderer.java b/core/java/android/view/GLRenderer.java
index 40ad72ca5bff..c1eb6b771c09 100644
--- a/core/java/android/view/GLRenderer.java
+++ b/core/java/android/view/GLRenderer.java
@@ -497,7 +497,9 @@ public class GLRenderer extends HardwareRenderer {
@Override
void onLayerDestroyed(HardwareLayer layer) {
- mGlCanvas.cancelLayerUpdate(layer);
+ if (mGlCanvas != null) {
+ mGlCanvas.cancelLayerUpdate(layer);
+ }
mAttachedLayers.remove(layer);
}