1 files changed, 20 insertions, 2 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
index bcc7037657..03fbdab3bd 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
@@ -5,6 +5,7 @@ import android.graphics.Bitmap;
 import android.graphics.PointF;
 import android.graphics.RectF;
 import android.os.Bundle;
+import android.os.Handler;
 import android.support.annotation.FloatRange;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -197,13 +198,20 @@ public final class MapboxMap {
   }
 
   /**
-   * Called the map finished loading style.
+   * Called when the map finished loading a style.
    */
   void onFinishLoadingStyle() {
     notifyStyleLoaded();
   }
 
   /**
+   * Called when the map failed loading a style.
+   */
+  void onFailLoadingStyle() {
+    styleLoadedCallbacks.clear();
+  }
+
+  /**
    * Called when the region is changing or has changed.
    */
   void onUpdateRegionChange() {
@@ -663,6 +671,7 @@ public final class MapboxMap {
    * Loads a new style from the specified offline region definition and moves the map camera to that region.
    *
    * @param definition the offline region definition
+   * @param callback   the callback to be invoked when the style has loaded
    * @see OfflineRegionDefinition
    */
   public void setOfflineRegionDefinition(@NonNull OfflineRegionDefinition definition,
@@ -812,7 +821,7 @@ public final class MapboxMap {
       // user didn't provide a `from` component,
       // flag the style as loaded,
       // add components defined added using the `with` prefix.
-      notifyStyleLoaded();
+      notifyStyleLoadedDelayed();
     }
   }
 
@@ -833,6 +842,15 @@ public final class MapboxMap {
     styleLoadedCallbacks.clear();
   }
 
+  private void notifyStyleLoadedDelayed() {
+    new Handler().post(new Runnable() {
+      @Override
+      public void run() {
+        notifyStyleLoaded();
+      }
+    });
+  }
+
   /**
    * Loads a new map style from MapboxMapOptions if available.
    *