summaryrefslogtreecommitdiffstats
path: root/opengl/java/android
diff options
context:
space:
mode:
authorJack Palevich <jackpal@google.com>2009-12-04 15:59:10 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-12-04 15:59:10 -0800
commit9196034b84c48844799a2904ef3ce31f18ee748e (patch)
tree8b608364215e2007718771e948c6f421402c2cf2 /opengl/java/android
parente300deaf2fd2842240ea90fd00296a6e2ceba9d8 (diff)
parent30d905235074f343ebac6002408ab5c2b360ea14 (diff)
downloadframeworks_base-9196034b84c48844799a2904ef3ce31f18ee748e.zip
frameworks_base-9196034b84c48844799a2904ef3ce31f18ee748e.tar.gz
frameworks_base-9196034b84c48844799a2904ef3ce31f18ee748e.tar.bz2
am 30d90523: Merge changes Id682ab72,I9bb4dbae into eclair-mr2
Merge commit '30d905235074f343ebac6002408ab5c2b360ea14' into eclair-mr2-plus-aosp * commit '30d905235074f343ebac6002408ab5c2b360ea14': Improve error message thrown when eglCreateContext fails. Improve error reporting by always returning the public
Diffstat (limited to 'opengl/java/android')
-rw-r--r--opengl/java/android/opengl/GLSurfaceView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/opengl/java/android/opengl/GLSurfaceView.java b/opengl/java/android/opengl/GLSurfaceView.java
index 8954ec6..1e3bd72 100644
--- a/opengl/java/android/opengl/GLSurfaceView.java
+++ b/opengl/java/android/opengl/GLSurfaceView.java
@@ -847,7 +847,7 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback
*/
mEglContext = mEGLContextFactory.createContext(mEgl, mEglDisplay, mEglConfig);
if (mEglContext == null || mEglContext == EGL10.EGL_NO_CONTEXT) {
- throw new RuntimeException("createContext failed");
+ throwEglException("createContext");
}
mEglSurface = null;