2 files changed, 14 insertions, 5 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java
index 01c82ddad4..9c2ae8492c 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java
@@ -2,6 +2,7 @@ package com.mapbox.mapboxsdk;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.content.res.AssetManager;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.UiThread;
@@ -222,4 +223,13 @@ public final class Mapbox {
   public static boolean hasInstance() {
     return INSTANCE != null;
   }
+
+  /**
+   * Internal use. Returns AssetManager.
+   *
+   * @return the asset manager
+   */
+  private static AssetManager getAssetManager() {
+    return getApplicationContext().getResources().getAssets();
+  }
 }
\ No newline at end of file
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java
index 763c97cca7..07e5b7e16d 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/storage/FileSource.java
@@ -4,7 +4,6 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
-import android.content.res.AssetManager;
 import android.os.AsyncTask;
 import android.os.Environment;
 import android.support.annotation.Keep;
@@ -90,7 +89,7 @@ public class FileSource {
   @UiThread
   public static synchronized FileSource getInstance(@NonNull Context context) {
     if (INSTANCE == null) {
-      INSTANCE = new FileSource(getResourcesCachePath(context), context.getResources().getAssets());
+      INSTANCE = new FileSource(getResourcesCachePath(context));
     }
 
     return INSTANCE;
@@ -366,8 +365,8 @@ public class FileSource {
   @Keep
   private long nativePtr;
 
-  private FileSource(String cachePath, AssetManager assetManager) {
-    initialize(Mapbox.getAccessToken(), cachePath, assetManager);
+  private FileSource(String cachePath) {
+    initialize(Mapbox.getAccessToken(), cachePath);
   }
 
   @Keep
@@ -404,7 +403,7 @@ public class FileSource {
   private native void setResourceCachePath(String path, ResourcesCachePathChangeCallback callback);
 
   @Keep
-  private native void initialize(String accessToken, String cachePath, AssetManager assetManager);
+  private native void initialize(String accessToken, String cachePath);
 
   @Override
   @Keep