commit 59eaeed5fabc27942d62327fa460ebb8bd2f3822
author Jesse Hall <jessehall@google.com> Mon May 13 23:31:54 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon May 13 23:31:54 2013 -0700
tree 12b08829177cdc3726c72b8e16b4723e7bba0be4
parent f9872c8124d896349d1dd0284def8bc9add8e0ac
parent 28fc78bf5fbb6288a27f3f25565a960a1873b0ef

am 28fc78bf: am e8fed71d: Merge "Abort surface composition if hw surface is invalid"

* commit '28fc78bf5fbb6288a27f3f25565a960a1873b0ef':
  Abort surface composition if hw surface is invalid

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 735c822..6ab33ef 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1538,7 +1538,11 @@
 
     const bool hasGlesComposition = hwc.hasGlesComposition(id) || (cur==end);
     if (hasGlesComposition) {
-        DisplayDevice::makeCurrent(mEGLDisplay, hw, mEGLContext);
+        if (!DisplayDevice::makeCurrent(mEGLDisplay, hw, mEGLContext)) {
+            ALOGW("DisplayDevice::makeCurrent failed. Aborting surface composition for display %s",
+                  hw->getDisplayName().string());
+            return;
+        }
 
         // set the frame buffer
         glMatrixMode(GL_MODELVIEW);