[android] dismiss the foreground color only when the style is loadedupstream/lp-black-screen-13566

1 files changed, 6 insertions, 4 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 cc1ffbbd3d..0f70524653 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
@@ -1002,10 +1002,12 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback {
 
     @Override
     public void onDidFinishRenderingFrame(boolean fully) {
-      renderCount++;
-      if (renderCount == 2) {
-        MapView.this.setForeground(null);
-        removeOnDidFinishRenderingFrameListener(this);
+      if (mapboxMap != null && mapboxMap.getStyle() != null && mapboxMap.getStyle().isFullyLoaded()) {
+        renderCount++;
+        if (renderCount == 3) {
+          MapView.this.setForeground(null);
+          removeOnDidFinishRenderingFrameListener(this);
+        }
       }
     }