commit 28fc78bf5fbb6288a27f3f25565a960a1873b0ef
author Jesse Hall <jessehall@google.com> Mon May 13 23:28:45 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon May 13 23:28:45 2013 -0700
tree 4ce6ce01cc51483136b8edb6c93f1479d28f0062
parent 7a4865287460a5f0ff26e22be5f0271735d32ac7
parent e8fed71da2d3e03ef933d308520bab5b860f05aa

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

* commit 'e8fed71da2d3e03ef933d308520bab5b860f05aa':
  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 e647275..902570b 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1537,7 +1537,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);