am 7a800e79: Merge "Avoid leaking AssetFileDescriptor."

* commit '7a800e7982ff607aa339f44742de935033f38cfe': Avoid leaking AssetFileDescriptor.
2013-04-29 22:33:22 -07:00 · 2013-04-29 22:33:22 -07:00 · 238748d57c
commit 238748d57c
parent 9a60460ac0 7a800e7982
1 changed files with 10 additions and 2 deletions
--- a/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java
+++ b/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java
@ -95,8 +95,16 @@ final class BinaryDictionaryGetter {
                    + fallbackResId);
            return null;
        }
-        return AssetFileAddress.makeFromFileNameAndOffset(
-                context.getApplicationInfo().sourceDir, afd.getStartOffset(), afd.getLength());
+        try {
+            return AssetFileAddress.makeFromFileNameAndOffset(
+                    context.getApplicationInfo().sourceDir, afd.getStartOffset(), afd.getLength());
+        } finally {
+            try {
+                afd.close();
+            } catch (IOException e) {
+                // Ignored
+            }
+        }
    }

    private static final class DictPackSettings {