diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2011-03-04 22:24:22 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2011-03-04 22:24:22 -0800 |
| commit | 107e87675721a89e9322b6530e01a99836f291dc (patch) | |
| tree | 8d16cd4b5a785cb275bdbd242ecd1b0c8a27c493 /java | |
| parent | 1cc3d5495cc0bba89cd1fe3f1ce003410bc8c5b6 (diff) | |
| parent | 5ac8546268a3c3cd2f523d086043d6200c553fa7 (diff) | |
| download | latinime-107e87675721a89e9322b6530e01a99836f291dc.tar.gz latinime-107e87675721a89e9322b6530e01a99836f291dc.tar.xz latinime-107e87675721a89e9322b6530e01a99836f291dc.zip | |
am 5ac85462: Merge "Fix a NPE caused by a null typedWord" into honeycomb-mr1
* commit '5ac8546268a3c3cd2f523d086043d6200c553fa7':
Fix a NPE caused by a null typedWord
Diffstat (limited to 'java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/ExpandableDictionary.java | 2 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/ExpandableDictionary.java b/java/src/com/android/inputmethod/latin/ExpandableDictionary.java index b10e7a61e..b0bbe6d52 100644 --- a/java/src/com/android/inputmethod/latin/ExpandableDictionary.java +++ b/java/src/com/android/inputmethod/latin/ExpandableDictionary.java @@ -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; } diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 646de66c2..c66cb5f26 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -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. |