diff options
| author | Jesse Hall <jessehall@google.com> | 2013-07-17 14:13:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-17 14:13:56 -0700 |
| commit | ba3ed90b095dfd397aa252fb0234647d7cc5c8f9 (patch) | |
| tree | d28b861dc7a457ceb64f865861eb239ab31a4e28 /opengl | |
| parent | 0e615634de25c7d29f9fcbab907a4d120d8b83e2 (diff) | |
| parent | 082fc1cae6a0c283de3ad0d848e0757de3154d0b (diff) | |
| download | frameworks_native-ba3ed90b095dfd397aa252fb0234647d7cc5c8f9.zip frameworks_native-ba3ed90b095dfd397aa252fb0234647d7cc5c8f9.tar.gz frameworks_native-ba3ed90b095dfd397aa252fb0234647d7cc5c8f9.tar.bz2 | |
am 082fc1ca: am ae961022: Merge "EGL: Fix error for eglCreateWindowSurface"
* commit '082fc1cae6a0c283de3ad0d848e0757de3154d0b':
EGL: Fix error for eglCreateWindowSurface
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libs/EGL/eglApi.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/opengl/libs/EGL/eglApi.cpp b/opengl/libs/EGL/eglApi.cpp index 015740a..6c285d3 100644 --- a/opengl/libs/EGL/eglApi.cpp +++ b/opengl/libs/EGL/eglApi.cpp @@ -373,7 +373,7 @@ EGLSurface eglCreateWindowSurface( EGLDisplay dpy, EGLConfig config, if (native_window_api_connect(window, NATIVE_WINDOW_API_EGL) != OK) { ALOGE("EGLNativeWindowType %p already connected to another API", window); - return setError(EGL_BAD_NATIVE_WINDOW, EGL_NO_SURFACE); + return setError(EGL_BAD_ALLOC, EGL_NO_SURFACE); } // set the native window's buffers format to match this config |