diff options
| author |   Satoshi Kataoka <satok@google.com> | 2013-04-03 19:21:01 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-04-03 19:21:01 -0700 |
| commit | 395e500b0905880e59c9e1b2442b37702a0ab78a (patch) | |
| tree | 72d6da22a9aacdd8ef42c726a305295a8f889308 /java/src | |
| parent | 0c99a379bd7eca152fa600a6ab4c214482270625 (diff) | |
| parent | bb9a8e082aebbcdd46e4d2378d9839f896c15476 (diff) | |
| download | latinime-395e500b0905880e59c9e1b2442b37702a0ab78a.tar.gz latinime-395e500b0905880e59c9e1b2442b37702a0ab78a.tar.xz latinime-395e500b0905880e59c9e1b2442b37702a0ab78a.zip | |
am bb9a8e08: am f463b45d: Merge "Fix Possible NPE"
* commit 'bb9a8e082aebbcdd46e4d2378d9839f896c15476':
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)); } |