commit 107e87675721a89e9322b6530e01a99836f291dc
author Ken Wakasa <kwakasa@google.com> Fri Mar 04 22:24:22 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 04 22:24:22 2011 -0800
tree 8d16cd4b5a785cb275bdbd242ecd1b0c8a27c493
parent 1cc3d5495cc0bba89cd1fe3f1ce003410bc8c5b6
parent 5ac8546268a3c3cd2f523d086043d6200c553fa7

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

* commit '5ac8546268a3c3cd2f523d086043d6200c553fa7':
  Fix a NPE caused by a null typedWord

java/src/com/android/inputmethod/latin/ExpandableDictionary.java

diff --git a/java/src/com/android/inputmethod/latin/ExpandableDictionary.java b/java/src/com/android/inputmethod/latin/ExpandableDictionary.java
index b10e7a6..b0bbe6d 100644
--- a/java/src/com/android/inputmethod/latin/ExpandableDictionary.java
+++ b/java/src/com/android/inputmethod/latin/ExpandableDictionary.java
@@ -225,7 +225,7 @@
     /**
      * 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;
     }

java/src/com/android/inputmethod/latin/LatinIME.java

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 646de66..c66cb5f 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1427,7 +1427,6 @@
 
     private void saveWordInHistory(CharSequence result) {
         if (mWord.size() <= 1) {
-            mWord.reset();
             return;
         }
         // Skip if result is null. It happens in some edge case.