Merge into jb-mr1-dev

Change-Id: Icd17d762c9d8e96ea6b78b18fa8f66471bc694ae
2012-09-25 09:28:24 -07:00
parent ca94050705 4c7dc4aa5c
commit c68accd35e
1 changed files with 6 additions and 0 deletions
--- a/core/java/android/view/HardwareRenderer.java
+++ b/core/java/android/view/HardwareRenderer.java
@@ -864,6 +864,12 @@ public abstract class HardwareRenderer {

            if (mEglContext == null) {
                mEglContext = createContext(sEgl, sEglDisplay, sEglConfig);
+                if (mEglContext == null) {
+                    //noinspection ConstantConditions
+                    throw new IllegalStateException("Could not create an EGL context. " +
+                            "eglCreateContext failed with error: " +
+                            GLUtils.getEGLErrorString(sEgl.eglGetError()));
+                }
                sEglContextStorage.set(createManagedContext(mEglContext));
            }
        }