diff options
| author | Jerry J. Wang <jerryw@google.com> | 2011-06-22 15:08:25 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-22 15:08:25 -0700 |
| commit | 850aaaeff6df3c1c6e9cec5ae67225bb57728e0e (patch) | |
| tree | 94c4a7dcbdb67b42771e4268993d725536dab394 | |
| parent | 929cba1391432eb66329781c866c92a07d3f45ae (diff) | |
| parent | 0b62c2a6e0a8f7122c93a33f94f671443a44e721 (diff) | |
| download | frameworks_base-850aaaeff6df3c1c6e9cec5ae67225bb57728e0e.zip frameworks_base-850aaaeff6df3c1c6e9cec5ae67225bb57728e0e.tar.gz frameworks_base-850aaaeff6df3c1c6e9cec5ae67225bb57728e0e.tar.bz2 | |
Merge "Don't throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)" into honeycomb-mr2
| -rw-r--r-- | opengl/java/android/opengl/GLSurfaceView.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/opengl/java/android/opengl/GLSurfaceView.java b/opengl/java/android/opengl/GLSurfaceView.java index 32d1a23..eaa1e6b 100644 --- a/opengl/java/android/opengl/GLSurfaceView.java +++ b/opengl/java/android/opengl/GLSurfaceView.java @@ -1096,6 +1096,10 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback // on the expectation that the application will be closed soon. Log.e("EglHelper", "eglSwapBuffers returned EGL_BAD_NATIVE_WINDOW. tid=" + Thread.currentThread().getId()); break; + case EGL10.EGL_BAD_CURRENT_SURFACE: + // The window was presumably closed by the window manager. + Log.e("EglHelper", "eglSwapBuffers returned EGL_BAD_CURRENT_SURFACE"); + break; default: throwEglException("eglSwapBuffers", error); } |