[android] - showcase freeze that occurs when we destroy the map while gl thread is already destroyedupstream/tvn-freeze

2 files changed, 15 insertions, 3 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java
index 2ad4837bb7..1f8c7ac55f 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java
@@ -191,14 +191,19 @@ public final class MapFragment extends Fragment implements OnMapReadyCallback {
     }
   }
 
+  @Override
+  public void onDestroy() {
+    super.onDestroy();
+    map.onDestroy();
+    mapReadyCallbackList.clear();
+  }
+
   /**
-   * Called when the fragment is view hiearchy is being destroyed.
+   * Called when the fragment is view hierarchy is being destroyed.
    */
   @Override
   public void onDestroyView() {
     super.onDestroyView();
-    map.onDestroy();
-    mapReadyCallbackList.clear();
   }
 
   /**
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/NativeMapViewTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/NativeMapViewTest.kt
index 6958a3519c..58623a5db2 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/NativeMapViewTest.kt
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/NativeMapViewTest.kt
@@ -13,6 +13,7 @@ import com.mapbox.mapboxsdk.maps.renderer.MapRenderer
 import com.mapbox.mapboxsdk.style.layers.TransitionOptions
 import com.mapbox.mapboxsdk.testapp.utils.TestConstants
 import junit.framework.Assert.*
+import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -41,6 +42,12 @@ class NativeMapViewTest {
         nativeMapView.resizeView(WIDTH, HEIGHT)
     }
 
+    @After
+    @UiThreadTest
+    fun after() {
+        nativeMapView.destroy()
+    }
+
     @Test
     @UiThreadTest
     fun testBearing() {