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

am 5ac85462: Merge "Fix a NPE caused by a null typedWord" into honeycomb-mr1 

* commit '5ac8546268a3c3cd2f523d086043d6200c553fa7':
  Fix a NPE caused by a null typedWord
main
Ken Wakasa 2011-03-04 22:24:22 -08:00 committed by Android Git Automerger
parent 1cc3d5495c 5ac8546268
commit 107e876757
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
*/
public int getWordFrequency(CharSequence word) {
protected int getWordFrequency(CharSequence word) {
Node node = searchNode(mRoots, word, 0, word.length());
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) {
if (mWord.size() <= 1) {
mWord.reset();
return;
}
// Skip if result is null. It happens in some edge case.