diff options
| author |   Satoshi Kataoka <satok@google.com> | 2013-03-27 04:51:46 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2013-03-27 04:51:48 +0000 |
| commit | f463b45d8e0f6603446496b38aaf45db7e4bb5dd (patch) | |
| tree | 30a1b732ab76d30a636e2f2f0557675139787528 /java/src | |
| parent | 2cdf5351aa11cc87494c5a86664b8bcd6f77d433 (diff) | |
| parent | 435cccb2c5869099be0fae07a103219410e3d2f1 (diff) | |
| download | latinime-f463b45d8e0f6603446496b38aaf45db7e4bb5dd.tar.gz latinime-f463b45d8e0f6603446496b38aaf45db7e4bb5dd.tar.xz latinime-f463b45d8e0f6603446496b38aaf45db7e4bb5dd.zip | |
Merge "Fix Possible NPE"
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)); } |