Cherry pick "Fix strict mode violations in Android."

Fix strict mode violations in Android.

BUG=408525
Committed:
https://chromium.googlesource.com/chromium/src/+/6c4efa4876f1397b51d4e067d73ecb202b860147

Bug: 17313418
Change-Id: I1417d0cff8e6de00ef5dde601d1d5c404423d887

1 files changed, 11 insertions, 2 deletions

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 97e292ff7a..55c94b6fec 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);
+            }
         }
     }
 }