commit 7a800e7982ff607aa339f44742de935033f38cfe
author Jeff Sharkey <jsharkey@android.com> Tue Apr 30 01:11:02 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 30 01:11:02 2013 +0000
tree d7ef54764215fd958edb478d380f6a966ce852a9
parent ed9ef5a778c038bc4618c36eae9df8d11fa9c992
parent c5ebc792d6f786a6dd46eafdc7895faa5cb9259a

Merge "Avoid leaking AssetFileDescriptor."

java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java

diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java b/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java
index ddd72f1..05c91a6 100644
--- a/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java
+++ b/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java
@@ -95,8 +95,16 @@
                     + 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 {