commit 71f4c6b8eacb210fceb719a0f293d14f359ba4f1
author Tadashi G. Takaoka <takaoka@google.com> Wed May 14 10:01:14 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 14 10:01:15 2014 +0000
tree dd6373e836b390241945acbcde8b4d8ac79e63b8
parent 08476dc1076cec7758786141bb86b3a5c46e4e35
parent 268bf2cdfe15aa22637603fa9920b2a2769cbcd3

Merge "Fix NPE that happens only in some unit tests"

java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java

diff --git a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
index 8b795b8..1156c77 100644
--- a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
+++ b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
@@ -936,7 +936,11 @@
             } else {
                 mWordComposer.processEvent(inputTransaction.mEvent);
             }
-            mConnection.setComposingText(getTextWithUnderline(mWordComposer.getTypedWord()), 1);
+            if (mWordComposer.isComposingWord()) {
+                mConnection.setComposingText(getTextWithUnderline(mWordComposer.getTypedWord()), 1);
+            } else {
+                mConnection.commitText("", 1);
+            }
             inputTransaction.setRequiresUpdateSuggestions();
         } else {
             if (mLastComposedWord.canRevertCommit()) {