diff options
| author |   Satoshi Kataoka <satok@google.com> | 2013-03-26 12:58:44 +0900 |
|---|---|---|
| committer | Satoshi Kataoka <satok@google.com> | 2013-03-26 13:02:23 +0900 |
| commit | 435cccb2c5869099be0fae07a103219410e3d2f1 (patch) | |
| tree | 6b0970b63e092ed83ba7edd10ad2207c617c9583 /java/src | |
| parent | 0b3271010fe6e438d57a5d4504e021e001bb9f5e (diff) | |
| download | latinime-435cccb2c5869099be0fae07a103219410e3d2f1.tar.gz latinime-435cccb2c5869099be0fae07a103219410e3d2f1.tar.xz latinime-435cccb2c5869099be0fae07a103219410e3d2f1.zip | |
Fix Possible NPE
Bug: 8448448
Change-Id: Ibe89c9abd24c4debb33a69c372eadf2afb09ea1c
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/UserHistoryDictIOUtils.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/UserHistoryDictIOUtils.java b/java/src/com/android/inputmethod/latin/UserHistoryDictIOUtils.java index 62f2a9750..10931555e 100644 --- a/java/src/com/android/inputmethod/latin/UserHistoryDictIOUtils.java +++ b/java/src/com/android/inputmethod/latin/UserHistoryDictIOUtils.java @@ -207,7 +207,12 @@ public final class UserHistoryDictIOUtils { final ArrayList<PendingAttribute> attrList = bigrams.get(entry.getKey()); if (attrList != null) { for (final PendingAttribute attr : attrList) { - to.setBigram(word1, unigrams.get(attr.mAddress), + final String word2 = unigrams.get(attr.mAddress); + if (word1 == null || word2 == null) { + Log.e(TAG, "Invalid bigram pair detected: " + word1 + ", " + word2); + continue; + } + to.setBigram(word1, word2, BinaryDictInputOutput.reconstructBigramFrequency(unigramFrequency, attr.mFrequency)); } |