aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2013-04-30 01:11:02 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-30 01:11:02 +0000
commit7a800e7982ff607aa339f44742de935033f38cfe (patch)
treed7ef54764215fd958edb478d380f6a966ce852a9 /java/src
parented9ef5a778c038bc4618c36eae9df8d11fa9c992 (diff)
parentc5ebc792d6f786a6dd46eafdc7895faa5cb9259a (diff)
downloadlatinime-7a800e7982ff607aa339f44742de935033f38cfe.tar.gz
latinime-7a800e7982ff607aa339f44742de935033f38cfe.tar.xz
latinime-7a800e7982ff607aa339f44742de935033f38cfe.zip
Merge "Avoid leaking AssetFileDescriptor."
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java12
1 files changed, 10 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java b/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java
index ddd72f18e..05c91a6ef 100644
--- 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 {