From ce3c42a1c237812aa01c0c6ea030a11223e77c1e Mon Sep 17 00:00:00 2001
From: Tobrun <tobrun@mapbox.com>
Date: Mon, 26 Mar 2018 09:40:22 -0400
Subject: [android] - don't load default style if style json string was set
 (#11520)

---
 .../src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java')

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 6542b15841..f23d3bd7f9 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
@@ -103,7 +103,7 @@ public final class MapboxMap {
    */
   void onStart() {
     nativeMapView.update();
-    if (TextUtils.isEmpty(nativeMapView.getStyleUrl())) {
+    if (TextUtils.isEmpty(nativeMapView.getStyleUrl()) && TextUtils.isEmpty(nativeMapView.getStyleJson())) {
       // if user hasn't loaded a Style yet
       nativeMapView.setStyleUrl(Style.MAPBOX_STREETS);
     }
-- 
cgit v1.2.1