aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorKen Wakasa <kwakasa@google.com>2011-03-05 09:13:40 +0900
committerKen Wakasa <kwakasa@google.com>2011-03-05 12:50:58 +0900
commitbaf263caf4681052fa627abe26efc9abfef40080 (patch)
tree8d16cd4b5a785cb275bdbd242ecd1b0c8a27c493 /java/src
parentd465e2aad1185bc9f2c27beb156b686184722094 (diff)
downloadlatinime-baf263caf4681052fa627abe26efc9abfef40080.tar.gz
latinime-baf263caf4681052fa627abe26efc9abfef40080.tar.xz
latinime-baf263caf4681052fa627abe26efc9abfef40080.zip
Fix a NPE caused by a null typedWord
bug: 3514797 Change-Id: Ie1056745ded1f848d1e4f70c5344d6969de509b0
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/latin/ExpandableDictionary.java2
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java1
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.