commit eb873c89e98b18b6db755aac4040bc45e3b1d11c
author Jesse Hall <jessehall@google.com> Wed Oct 14 20:30:38 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 14 20:30:38 2015 +0000
tree 6c907769636e6308be92b0b2888872adf44517a9
parent 0ee1b1ff1f454e72a5b2ef2fbe78f7b66eba8bd4
parent 0983618f0ad57b873163183eac6caf8dea7920c8

am 0983618f: am a518d5ad: am 312d7555: egl: Remove window disconnect before calling driver eglDestroySurface

* commit '0983618f0ad57b873163183eac6caf8dea7920c8':
  egl: Remove window disconnect before calling driver eglDestroySurface

opengl/libs/EGL/eglApi.cpp

diff --git a/opengl/libs/EGL/eglApi.cpp b/opengl/libs/EGL/eglApi.cpp
index 8378907..cdec565 100644
--- a/opengl/libs/EGL/eglApi.cpp
+++ b/opengl/libs/EGL/eglApi.cpp
@@ -595,15 +595,6 @@
         return setError(EGL_BAD_SURFACE, EGL_FALSE);
 
     egl_surface_t * const s = get_surface(surface);
-    ANativeWindow* window = s->win.get();
-    if (window) {
-        int result = native_window_api_disconnect(window, NATIVE_WINDOW_API_EGL);
-        if (result != OK) {
-            ALOGE("eglDestroySurface: native_window_api_disconnect (win=%p) "
-                  "failed (%#x)",
-                  window, result);
-        }
-    }
     EGLBoolean result = s->cnx->egl.eglDestroySurface(dp->disp.dpy, s->surface);
     if (result == EGL_TRUE) {
         _s.terminate();