aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2013-04-29 22:33:22 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-29 22:33:22 -0700
commit238748d57c8ba770be4c3e34fa6d704893de3d07 (patch)
treed6f7f226ca3281235e49a52ac95128419883bd65 /java/src
parent9a60460ac0fb9a5ee4628639aac7d8106e368426 (diff)
parent7a800e7982ff607aa339f44742de935033f38cfe (diff)
downloadlatinime-238748d57c8ba770be4c3e34fa6d704893de3d07.tar.gz
latinime-238748d57c8ba770be4c3e34fa6d704893de3d07.tar.xz
latinime-238748d57c8ba770be4c3e34fa6d704893de3d07.zip
am 7a800e79: Merge "Avoid leaking AssetFileDescriptor."
* commit '7a800e7982ff607aa339f44742de935033f38cfe': 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 {