Aggressively exit HostConnection on eglReleaseThread

bug: 116981035

- Needed for proper thread cleanup on host side goldfish-opengl tests

Change-Id: If77e3730d23f90ce1e93b90e2c7ff73a379d8c02

2 files changed, 10 insertions, 2 deletions

diff --git a/system/OpenglSystemCommon/ThreadInfo.cpp b/system/OpenglSystemCommon/ThreadInfo.cpp
index 32bb54ec..31a8fe99 100644
--- a/system/OpenglSystemCommon/ThreadInfo.cpp
+++ b/system/OpenglSystemCommon/ThreadInfo.cpp
@@ -29,7 +29,10 @@ static bool (*sTlsDestructorCallback)(void*) = sDefaultTlsDestructorCallback;
 static void tlsDestruct(void *ptr)
 {
     sTlsDestructorCallback(ptr);
-    if (ptr) {
+    if (ptr
+#ifdef __ANDROID__
+         && ((void **)__get_tls())[TLS_SLOT_OPENGL]) {
+#endif
         EGLThreadInfo *ti = (EGLThreadInfo *)ptr;
         delete ti->hostConn;
         delete ti;
diff --git a/system/egl/egl.cpp b/system/egl/egl.cpp
index c5fc04a2..5b645c0b 100644
--- a/system/egl/egl.cpp
+++ b/system/egl/egl.cpp
@@ -1288,7 +1288,10 @@ static EGLBoolean s_eglReleaseThreadImpl(EGLThreadInfo* tInfo) {
     tInfo->eglError = EGL_SUCCESS;
     EGLContext_t* context = tInfo->currentContext;
 
-    if (!context || !s_display.isContext(context)) return EGL_TRUE;
+    if (!context || !s_display.isContext(context)) {
+        HostConnection::exit();
+        return EGL_TRUE;
+    }
 
     // The following code is doing pretty much the same thing as
     // eglMakeCurrent(&s_display, EGL_NO_CONTEXT, EGL_NO_SURFACE, EGL_NO_SURFACE)
@@ -1310,6 +1313,8 @@ static EGLBoolean s_eglReleaseThreadImpl(EGLThreadInfo* tInfo) {
     }
     tInfo->currentContext = 0;
 
+    HostConnection::exit();
+
     return EGL_TRUE;
 }