[android] #5649 - fixes fragment null pointer when creating a SupportMapFragment without a OnMapReadyCallback

1 files changed, 3 insertions, 2 deletions

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 56c3087987..f78fc50ebc 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
@@ -1743,7 +1743,6 @@ public class MapView extends FrameLayout {
             // reset tracking modes if gesture occurs
             resetTrackingModesIfRequired();
 
-
             // Cancel any animation
             mNativeMapView.cancelTransitions();
 
@@ -2559,7 +2558,9 @@ public class MapView extends FrameLayout {
         if (!mInitialLoad) {
             callback.onMapReady(mMapboxMap);
         } else {
-            mOnMapReadyCallbackList.add(callback);
+            if(callback!=null) {
+                mOnMapReadyCallbackList.add(callback);
+            }
         }
     }