am 7a800e79: Merge "Avoid leaking AssetFileDescriptor."

* commit '7a800e7982ff607aa339f44742de935033f38cfe':
  Avoid leaking AssetFileDescriptor.
This commit is contained in:
Jeff Sharkey 2013-04-29 22:33:22 -07:00 committed by Android Git Automerger
commit 238748d57c

View file

@ -95,8 +95,16 @@ final class BinaryDictionaryGetter {
+ fallbackResId); + fallbackResId);
return null; return null;
} }
try {
return AssetFileAddress.makeFromFileNameAndOffset( return AssetFileAddress.makeFromFileNameAndOffset(
context.getApplicationInfo().sourceDir, afd.getStartOffset(), afd.getLength()); context.getApplicationInfo().sourceDir, afd.getStartOffset(), afd.getLength());
} finally {
try {
afd.close();
} catch (IOException e) {
// Ignored
}
}
} }
private static final class DictPackSettings { private static final class DictPackSettings {