commit 11a8d4f8b99549262bcc9b64efe8ca21801c8f91
author Chris Craik <ccraik@android.com> Tue Jun 17 01:31:16 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 17 01:31:16 2014 +0000
tree 825eae667d1106b0b25cca7be6532ab1a4376b13
parent 658639c6bc43d06557be68f3b48d3263531b90e5
parent 678886fde5cd779de79f8e38479aa6de82f8e755

am 678886fd: am b1fc06a4: am 5e7ef948: Merge "hwui: fix possible null pointer de-refrence"

* commit '678886fde5cd779de79f8e38479aa6de82f8e755':
  hwui: fix possible null pointer de-refrence

libs/hwui/LayerRenderer.cpp

diff --git a/libs/hwui/LayerRenderer.cpp b/libs/hwui/LayerRenderer.cpp
index df9aee5..a5fd375 100644
--- a/libs/hwui/LayerRenderer.cpp
+++ b/libs/hwui/LayerRenderer.cpp
@@ -334,8 +334,10 @@
 
 void LayerRenderer::flushLayer(Layer* layer) {
 #ifdef GL_EXT_discard_framebuffer
+    if (!layer) return;
+
     GLuint fbo = layer->getFbo();
-    if (layer && fbo) {
+    if (fbo) {
         // If possible, discard any enqueud operations on deferred
         // rendering architectures
         if (Extensions::getInstance().hasDiscardFramebuffer()) {