From 89c290a72bc91bde8860e29b1af336691a46851d Mon Sep 17 00:00:00 2001
From: Alexey Krasilnikov <aleksei.krasilnikov@mapbox.com>
Date: Fri, 24 Sep 2021 10:16:41 +0300
Subject: [PATCH] #669: try to fix black screen on emulator

---
 sdk/src/main/java/com/mapbox/maps/renderer/egl/EGLCore.kt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/sdk/src/main/java/com/mapbox/maps/renderer/egl/EGLCore.kt b/sdk/src/main/java/com/mapbox/maps/renderer/egl/EGLCore.kt
index d8027866a1..c298454b0d 100644
--- a/sdk/src/main/java/com/mapbox/maps/renderer/egl/EGLCore.kt
+++ b/sdk/src/main/java/com/mapbox/maps/renderer/egl/EGLCore.kt
@@ -91,6 +91,14 @@ internal class EGLCore(
    */
   fun releaseSurface(eglSurface: EGLSurface) {
     if (eglSurface != EGL10.EGL_NO_SURFACE && eglDisplay != EGL10.EGL_NO_DISPLAY) {
+      if (egl.eglGetCurrentSurface(EGL10.EGL_DRAW) == eglSurface) {
+        egl.eglMakeCurrent(
+          eglDisplay,
+          EGL10.EGL_NO_SURFACE,
+          EGL10.EGL_NO_SURFACE,
+          EGL10.EGL_NO_CONTEXT
+        )
+      }
       egl.eglDestroySurface(eglDisplay, eglSurface)
     }
   }