nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am f463b45d: Merge "Fix Possible NPE" 

* commit 'f463b45d8e0f6603446496b38aaf45db7e4bb5dd':
  Fix Possible NPE
main
Satoshi Kataoka 2013-03-26 21:53:29 -07:00 committed by Android Git Automerger
parent e42522f335 f463b45d8e
commit bb9a8e082a
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
java/src/com/android/inputmethod/latin/UserHistoryDictIOUtils.java
View File

@ -207,7 +207,12 @@ public final class UserHistoryDictIOUtils {
final ArrayList<PendingAttribute> attrList = bigrams.get(entry.getKey()); final ArrayList<PendingAttribute> attrList = bigrams.get(entry.getKey());
if (attrList != null) { if (attrList != null) {
for (final PendingAttribute attr : attrList) { 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, BinaryDictInputOutput.reconstructBigramFrequency(unigramFrequency,
attr.mFrequency)); attr.mFrequency));
} }