Index: base/android/java/src/org/chromium/base/ApkAssets.java |
diff --git a/base/android/java/src/org/chromium/base/ApkAssets.java b/base/android/java/src/org/chromium/base/ApkAssets.java |
index f3c89f30e06200bad2e4f3c63ffe3d3d7a4fc56e..19108e59579a3e0219df75569aa989e7850791cb 100644 |
--- a/base/android/java/src/org/chromium/base/ApkAssets.java |
+++ b/base/android/java/src/org/chromium/base/ApkAssets.java |
@@ -4,7 +4,6 @@ |
package org.chromium.base; |
-import android.content.Context; |
import android.content.res.AssetFileDescriptor; |
import android.content.res.AssetManager; |
import android.util.Log; |
@@ -24,14 +23,13 @@ public class ApkAssets { |
private static final String LOGTAG = "ApkAssets"; |
@CalledByNative |
- public static long[] open(Context context, String fileName) { |
+ public static long[] open(String fileName) { |
AssetFileDescriptor afd = null; |
try { |
- AssetManager manager = context.getAssets(); |
+ AssetManager manager = ContextUtils.getApplicationContext().getAssets(); |
afd = manager.openNonAssetFd(fileName); |
- return new long[] { afd.getParcelFileDescriptor().detachFd(), |
- afd.getStartOffset(), |
- afd.getLength() }; |
+ return new long[] {afd.getParcelFileDescriptor().detachFd(), afd.getStartOffset(), |
+ afd.getLength()}; |
} catch (IOException e) { |
// As a general rule there's no point logging here because the caller should handle |
// receiving an fd of -1 sensibly, and the log message is either mirrored later, or |