commit 93ce78f6b97f7cf01f40c875a1a6084ab2fab732
author Jesse Hall <jessehall@google.com> Mon Jul 25 06:22:49 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jul 25 06:22:49 2016 +0000
tree bca01d26244b8cc558af243a0d1cf16d7c33e7c4
parent 528378d435602d58d6adf7e8ed41f07b190bfbbb
parent 21f67731bb5c0e399a78aa0330ce4738e70e106f

resolve merge conflicts of 75b79d3 to stage-aosp-master
am: 21f67731bb

Change-Id: I8d823ce09258b4b6ee1ec9dece8a46794d6fe87a

opengl/libs/EGL/eglApi.cpp

diff --git a/opengl/libs/EGL/eglApi.cpp b/opengl/libs/EGL/eglApi.cpp
index ec5a9f6..5de5599 100644
--- a/opengl/libs/EGL/eglApi.cpp
+++ b/opengl/libs/EGL/eglApi.cpp
@@ -1306,13 +1306,14 @@
 {
     clearError();
 
-    // If there is context bound to the thread, release it
-    egl_display_t::loseCurrent(get_context(getContext()));
-
     egl_connection_t* const cnx = &gEGLImpl;
     if (cnx->dso && cnx->egl.eglReleaseThread) {
         cnx->egl.eglReleaseThread();
     }
+
+    // If there is context bound to the thread, release it
+    egl_display_t::loseCurrent(get_context(getContext()));
+
     egl_tls_t::clearTLS();
     return EGL_TRUE;
 }