Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1354)

Unified Diff: android_webview/java/src/org/chromium/android_webview/AwAssets.java

Issue 513173002: Fix strict mode violation in Android WebView. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix some more warnings Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/public/android/java/src/org/chromium/content/browser/ResourceExtractor.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/java/src/org/chromium/android_webview/AwAssets.java
diff --git a/android_webview/java/src/org/chromium/android_webview/AwAssets.java b/android_webview/java/src/org/chromium/android_webview/AwAssets.java
index 97e292ff7a37ff0be2f9088c6ff60b1e9ebaf755..55c94b6fec5d85cb18d08dbe930264a0899cd9c6 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwAssets.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwAssets.java
@@ -24,15 +24,24 @@ public class AwAssets {
@CalledByNative
public static long[] openAsset(Context context, String fileName) {
+ AssetFileDescriptor afd = null;
try {
AssetManager manager = context.getAssets();
- AssetFileDescriptor afd = manager.openFd(fileName);
+ afd = manager.openFd(fileName);
return new long[] { afd.getParcelFileDescriptor().detachFd(),
afd.getStartOffset(),
afd.getLength() };
} catch (IOException e) {
- Log.e(LOGTAG, "Error while loading asset " + fileName + ": " + e.getMessage());
+ Log.e(LOGTAG, "Error while loading asset " + fileName + ": " + e);
return new long[] {-1, -1, -1};
+ } finally {
+ try {
+ if (afd != null) {
+ afd.close();
+ }
+ } catch (IOException e2) {
+ Log.e(LOGTAG, "Unable to close AssetFileDescriptor", e2);
+ }
}
}
}
« no previous file with comments | « no previous file | content/public/android/java/src/org/chromium/content/browser/ResourceExtractor.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698