commit 187e683aea117fde1ad2de2d0cdd18c3fd4ce7f4
author Jean Chalard <jchalard@google.com> Wed Nov 14 20:37:17 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 14 20:37:19 2012 -0800
tree 91607f0a5a9c60d2573b1b6eb2128a20d880f6b5
parent e4958d5c185ecf3a4e953c4a20f0208ac396da56
parent 00c0010ccf2de188743cb8f7364b8ba8b9faf7f8

Merge "Fix a bug with some text fields" into jb-mr1.1-dev

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

diff --git a/java/src/com/android/inputmethod/latin/RichInputConnection.java b/java/src/com/android/inputmethod/latin/RichInputConnection.java
index 2144136..75b67bf 100644
--- a/java/src/com/android/inputmethod/latin/RichInputConnection.java
+++ b/java/src/com/android/inputmethod/latin/RichInputConnection.java
@@ -145,7 +145,8 @@
         mCurrentCursorPosition = newCursorPosition;
         mComposingText.setLength(0);
         mCommittedTextBeforeComposingText.setLength(0);
-        mCommittedTextBeforeComposingText.append(getTextBeforeCursor(DEFAULT_TEXT_CACHE_SIZE, 0));
+        final CharSequence textBeforeCursor = getTextBeforeCursor(DEFAULT_TEXT_CACHE_SIZE, 0);
+        if (null != textBeforeCursor) mCommittedTextBeforeComposingText.append(textBeforeCursor);
         mCharAfterTheCursor = getTextAfterCursor(1, 0);
         if (null != mIC) {
             mIC.finishComposingText();