aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2013-09-18 21:39:30 +0900
committerJean Chalard <jchalard@google.com>2013-09-18 21:39:30 +0900
commit673275cbc6c6fbef3b33a7493f93470c8d953bef (patch)
treec9a475365c21c8717f94cd6e0da2db65c5fe2d0e /java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java
parent9b78241dff6b785408ae19512f6875e63771b349 (diff)
downloadlatinime-673275cbc6c6fbef3b33a7493f93470c8d953bef.tar.gz
latinime-673275cbc6c6fbef3b33a7493f93470c8d953bef.tar.xz
latinime-673275cbc6c6fbef3b33a7493f93470c8d953bef.zip
Fix an NPE.
Apparently, it is possible that File#getPath() returns null. In this case, we'll have a null AssetFileAddress and an NPE later down the road. Bug: 9944824 Change-Id: Id6ceac1cb55439660f9811cf0fe3b574200d5a20
Diffstat (limited to 'java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java')
-rw-r--r--java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java3
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");
}