commit e8fed71da2d3e03ef933d308520bab5b860f05aa
author Jesse Hall <jessehall@google.com> Tue May 14 00:24:28 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 14 00:24:28 2013 +0000
tree 17ff74d7a525a5b53eac1c21c80845fd95c43016
parent f0dcff89acb998179757ca66b5c6a2c585a980e9
parent c8c71096195de0128e57574b1ddf685838ceb2f0

Merge "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 9afa4c1..055bfe4 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1520,7 +1520,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);