am 082fc1ca: am ae961022: Merge "EGL: Fix error for eglCreateWindowSurface"

* commit '082fc1cae6a0c283de3ad0d848e0757de3154d0b':
  EGL: Fix error for eglCreateWindowSurface
This commit is contained in:
Jesse Hall 2013-07-17 14:13:56 -07:00 committed by Android Git Automerger
commit ba3ed90b09

View File

@ -373,7 +373,7 @@ EGLSurface eglCreateWindowSurface( EGLDisplay dpy, EGLConfig config,
if (native_window_api_connect(window, NATIVE_WINDOW_API_EGL) != OK) { if (native_window_api_connect(window, NATIVE_WINDOW_API_EGL) != OK) {
ALOGE("EGLNativeWindowType %p already connected to another API", ALOGE("EGLNativeWindowType %p already connected to another API",
window); 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 // set the native window's buffers format to match this config