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

am bb9a8e08: am f463b45d: Merge "Fix Possible NPE"

Browse source 
* commit 'bb9a8e082aebbcdd46e4d2378d9839f896c15476':
  Fix Possible NPE
This commit is contained in:
Satoshi Kataoka 2013-04-03 19:21:01 -07:00 committed by Android Git Automerger
commit 395e500b09
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));
} }