summaryrefslogtreecommitdiffstats
path: root/opengl/java/android
diff options
context:
space:
mode:
authorJack Palevich <jackpal@google.com>2009-12-07 14:55:39 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-12-07 14:55:39 -0800
commitc373edbf1c7066668b8bf5fe90edd3fedd94c78b (patch)
tree87d1b2f0fb7edec9569136ab353ed77e4083d5b4 /opengl/java/android
parente8a43b236754038b61a85eb294fdb03c18e82a00 (diff)
parent9196034b84c48844799a2904ef3ce31f18ee748e (diff)
downloadframeworks_base-c373edbf1c7066668b8bf5fe90edd3fedd94c78b.zip
frameworks_base-c373edbf1c7066668b8bf5fe90edd3fedd94c78b.tar.gz
frameworks_base-c373edbf1c7066668b8bf5fe90edd3fedd94c78b.tar.bz2
am 9196034b: am 30d90523: Merge changes Id682ab72,I9bb4dbae into eclair-mr2
Merge commit '9196034b84c48844799a2904ef3ce31f18ee748e' * commit '9196034b84c48844799a2904ef3ce31f18ee748e': 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 6beca2c..185398b 100644
--- a/opengl/java/android/opengl/GLSurfaceView.java
+++ b/opengl/java/android/opengl/GLSurfaceView.java
@@ -901,7 +901,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;