commit dbb3b98a1d6104f4d1e816400538db050015422d
author Jean Chalard <jchalard@google.com> Wed Sep 18 05:44:36 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 18 05:44:36 2013 -0700
tree 058ee097894ebb51bc60efe5383f72953e56b2a5
parent 1defb939c5f4fd13a4fe3642c7f710fca6aa2af6
parent 8678062853291f46ea0b994375b251b6604c42a6

am 86780628: Merge "Fix an NPE."

* commit '8678062853291f46ea0b994375b251b6604c42a6':
  Fix an NPE.

java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java

diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java b/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java
index 5661842..181ad17 100644
--- a/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java
+++ b/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java
@@ -286,7 +286,8 @@
             }
             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");
             }