diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-09-25 09:28:24 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-09-25 09:28:32 -0700 |
| commit | c68accd35e9ee0a49172ef144664f0fe9187ccd7 (patch) | |
| tree | 7bf9efc26b67c484101038db23b8fcc2b09a8053 /core/java | |
| parent | ca94050705ff1886e622a09c2691a76e92c0f9d8 (diff) | |
| parent | 4c7dc4aa5c6c155d7756ad40befc931fc0719976 (diff) | |
| download | frameworks_base-c68accd35e9ee0a49172ef144664f0fe9187ccd7.zip frameworks_base-c68accd35e9ee0a49172ef144664f0fe9187ccd7.tar.gz frameworks_base-c68accd35e9ee0a49172ef144664f0fe9187ccd7.tar.bz2 | |
Merge into jb-mr1-dev
Change-Id: Icd17d762c9d8e96ea6b78b18fa8f66471bc694ae
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/view/HardwareRenderer.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/view/HardwareRenderer.java b/core/java/android/view/HardwareRenderer.java index bafab21..49f9e9d 100644 --- 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)); } } |