resolve merge conflicts of 75b79d3 to stage-aosp-master am: 21f67731bb am: 93ce78f6b9 (f26b0fc1) · Commits · e / os / platform_frameworks_native

opengl/libs/EGL/eglApi.cpp

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1324,13 +1324,14 @@ EGLBoolean eglReleaseThread(void)
	{		{
	clearError();		clearError();

	// If there is context bound to the thread, release it
	egl_display_t::loseCurrent(get_context(getContext()));

	egl_connection_t* const cnx = &gEGLImpl;		egl_connection_t* const cnx = &gEGLImpl;
	if (cnx->dso && cnx->egl.eglReleaseThread) {		if (cnx->dso && cnx->egl.eglReleaseThread) {
	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();		egl_tls_t::clearTLS();
	return EGL_TRUE;		return EGL_TRUE;
	}		}