From 6dbdf3aaeb8b1a18e989bc4e7672cb2d801b2426 Mon Sep 17 00:00:00 2001
From: Robin Darby <robin.darby@mapquest.com>
Date: Mon, 28 Aug 2017 15:02:44 -0600
Subject: [android] Clear out mapCallback's OnMapReadyCallbacks on onDestroy

---
 .../src/main/java/com/mapbox/mapboxsdk/maps/MapView.java             | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
index 32c4952aa1..91c77c3e33 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
@@ -264,6 +264,7 @@ public class MapView extends FrameLayout {
     nativeMapView.terminateContext();
     nativeMapView.terminateDisplay();
     nativeMapView.destroySurface();
+    mapCallback.clearOnMapReadyCallbacks();
     nativeMapView.destroy();
     nativeMapView = null;
   }
@@ -955,5 +956,9 @@ public class MapView extends FrameLayout {
     void addOnMapReadyCallback(OnMapReadyCallback callback) {
       onMapReadyCallbackList.add(callback);
     }
+
+    void clearOnMapReadyCallbacks() {
+      onMapReadyCallbackList.clear();
+    }
   }
 }
-- 
cgit v1.2.1