Merge into jb-mr1-dev

Jean-Baptiste Queru · Jean-Baptiste Queru · commit c68accd35e9e · 2012-09-25T09:28:32.000-07:00
Change-Id: Icd17d762c9d8e96ea6b78b18fa8f66471bc694ae
diff --git a/core/java/android/view/HardwareRenderer.java b/core/java/android/view/HardwareRenderer.java
@@ -864,6 +864,12 @@ void initializeEgl() {
 
             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));
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -864,6 +864,12 @@ void initializeEgl() {`
`864`	`864`
`865`	`865`	`if (mEglContext == null) {`
`866`	`866`	`mEglContext = createContext(sEgl, sEglDisplay, sEglConfig);`
	`867`	`+ if (mEglContext == null) {`
	`868`	`+ //noinspection ConstantConditions`
	`869`	`+ throw new IllegalStateException("Could not create an EGL context. " +`
	`870`	`+ "eglCreateContext failed with error: " +`
	`871`	`+ GLUtils.getEGLErrorString(sEgl.eglGetError()));`
	`872`	`+ }`
`867`	`873`	`sEglContextStorage.set(createManagedContext(mEglContext));`
`868`	`874`	`}`
`869`	`875`	`}`