Merge "Avoid crash if layer is destroyed after GLRenderer"

2014-02-12 21:52:42 +00:00
parent c65d26ee0e 637314d15c
commit c70c723cf8
1 changed files with 3 additions and 1 deletions
--- 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);
    }