am 86780628: Merge "Fix an NPE."

* commit '8678062853291f46ea0b994375b251b6604c42a6':
  Fix an NPE.
This commit is contained in:
Jean Chalard 2013-09-18 05:44:36 -07:00 committed by Android Git Automerger
commit dbb3b98a1d

View File

@ -286,7 +286,8 @@ final public class BinaryDictionaryGetter {
}
if (!dictPackSettings.isWordListActive(wordListId)) continue;
if (canUse) {
fileList.add(AssetFileAddress.makeFromFileName(f.getPath()));
final AssetFileAddress afa = AssetFileAddress.makeFromFileName(f.getPath());
if (null != afa) fileList.add(afa);
} else {
Log.e(TAG, "Found a cached dictionary file but cannot read or use it");
}