diff options
| author |   Jean Chalard <jchalard@google.com> | 2013-09-18 05:44:36 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-09-18 05:44:36 -0700 |
| commit | dbb3b98a1d6104f4d1e816400538db050015422d (patch) | |
| tree | 058ee097894ebb51bc60efe5383f72953e56b2a5 /java/src | |
| parent | 1defb939c5f4fd13a4fe3642c7f710fca6aa2af6 (diff) | |
| parent | 8678062853291f46ea0b994375b251b6604c42a6 (diff) | |
| download | latinime-dbb3b98a1d6104f4d1e816400538db050015422d.tar.gz latinime-dbb3b98a1d6104f4d1e816400538db050015422d.tar.xz latinime-dbb3b98a1d6104f4d1e816400538db050015422d.zip | |
am 86780628: Merge "Fix an NPE."
* commit '8678062853291f46ea0b994375b251b6604c42a6':
Fix an NPE.
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java b/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java index 566184244..181ad17ea 100644 --- a/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java +++ b/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java @@ -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"); } |