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

Merge "Fix a NPE caused by a null typedWord" into honeycomb-mr1

Browse source
This commit is contained in:
Ken Wakasa 2011-03-04 22:14:24 -08:00 committed by Android (Google) Code Review
commit 5ac8546268
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
java/src/com/android/inputmethod/latin/ExpandableDictionary.java
View file

@ -225,7 +225,7 @@ public class ExpandableDictionary extends Dictionary {
/** /**
* Returns the word's frequency or -1 if not found * Returns the word's frequency or -1 if not found
*/ */
public int getWordFrequency(CharSequence word) { protected int getWordFrequency(CharSequence word) {
Node node = searchNode(mRoots, word, 0, word.length()); Node node = searchNode(mRoots, word, 0, word.length());
return (node == null) ? -1 : node.mFrequency; return (node == null) ? -1 : node.mFrequency;
} }

1
java/src/com/android/inputmethod/latin/LatinIME.java
View file

@ -1427,7 +1427,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
private void saveWordInHistory(CharSequence result) { private void saveWordInHistory(CharSequence result) {
if (mWord.size() <= 1) { if (mWord.size() <= 1) {
mWord.reset();
return; return;
} }
// Skip if result is null. It happens in some edge case. // Skip if result is null. It happens in some edge case.