1 files changed, 1 insertions, 17 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 f460a77229..30abee0d2c 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
@@ -16,7 +16,6 @@ import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.mapbox.mapboxsdk.Mapbox;
 import com.mapbox.mapboxsdk.annotations.Annotation;
 import com.mapbox.mapboxsdk.annotations.BaseMarkerOptions;
 import com.mapbox.mapboxsdk.annotations.BaseMarkerViewOptions;
@@ -93,7 +92,6 @@ public final class MapboxMap {
 
     // Map configuration
     setDebugActive(options.getDebugActive());
-    setApiBaseUrl(options);
     setStyleUrl(options);
   }
 
@@ -759,17 +757,6 @@ public final class MapboxMap {
   }
 
   //
-  // API endpoint config
-  //
-
-  private void setApiBaseUrl(@NonNull MapboxMapOptions options) {
-    String apiBaseUrl = options.getApiBaseUrl();
-    if (!TextUtils.isEmpty(apiBaseUrl)) {
-      nativeMapView.setApiBaseUrl(apiBaseUrl);
-    }
-  }
-
-  //
   // Styling
   //
 
@@ -837,10 +824,7 @@ public final class MapboxMap {
   private void setStyleUrl(@NonNull MapboxMapOptions options) {
     String style = options.getStyle();
     if (!TextUtils.isEmpty(style)) {
-      // stopgap for https://github.com/mapbox/mapbox-gl-native/issues/6242
-      if (TextUtils.isEmpty(nativeMapView.getAccessToken())) {
-        nativeMapView.setAccessToken(Mapbox.getAccessToken());
-      }
+      setStyleUrl(style);
       setStyleUrl(style);
     }
   }