Merge "Avoid leaking AssetFileDescriptor."

main
Jeff Sharkey 2013-04-30 01:11:02 +00:00 committed by Android (Google) Code Review
commit 7a800e7982
1 changed files with 10 additions and 2 deletions

View File

@ -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 {