From 637314d15c2dacc2d5daeecf17dc668ce405b25c Mon Sep 17 00:00:00 2001
From: Chris Craik <ccraik@google.com>
Date: Wed, 12 Feb 2014 13:44:47 -0800
Subject: Avoid crash if layer is destroyed after GLRenderer

bug:12988766
Change-Id: I96961aeef0b1d42ae8c609f1607a100e61a3d593
---
 core/java/android/view/GLRenderer.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'core/java/android')

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);
     }
 
-- 
cgit v1.2.3