Merge branch 'master' into ls-android-readme-tweaksupstream/ls-android-readme-tweaks

1 files changed, 8 insertions, 2 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 8b1ba7b771..01c6da4971 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
@@ -76,6 +76,9 @@ public final class MapFragment extends Fragment {
   public void onViewCreated(View view, Bundle savedInstanceState) {
     super.onViewCreated(view, savedInstanceState);
     map.onCreate(savedInstanceState);
+    if (onMapReadyCallback != null) {
+      map.getMapAsync(onMapReadyCallback);
+    }
   }
 
   /**
@@ -85,7 +88,6 @@ public final class MapFragment extends Fragment {
   public void onStart() {
     super.onStart();
     map.onStart();
-    map.getMapAsync(onMapReadyCallback);
   }
 
   /**
@@ -150,6 +152,10 @@ public final class MapFragment extends Fragment {
    * @param onMapReadyCallback The callback to be invoked.
    */
   public void getMapAsync(@NonNull final OnMapReadyCallback onMapReadyCallback) {
-    this.onMapReadyCallback = onMapReadyCallback;
+    if (map == null) {
+      this.onMapReadyCallback = onMapReadyCallback;
+    } else {
+      map.getMapAsync(onMapReadyCallback);
+    }
   }
 }