Merge "Fix a NPE caused by a null typedWord" into honeycomb-mr1
commit
5ac8546268
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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.
|
||||
|
|
Loading…
Reference in New Issue