commit 3a9f84a197887ef9ab44c925f79863a707e6bffc
author Jean Chalard <jchalard@google.com> Fri Nov 16 10:36:15 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 16 10:36:15 2012 -0800
tree 60b5b60bebf41d9949011bd7e39a71a86d48eb79
parent 2feb6b5b523b480aa5ad4452840725ecd77134f5
parent 8c470f16db291e257ac538bd0ac2a9354d34010c

am 8c470f16: am 5dee6e69: am 187e683a: Merge "Fix a bug with some text fields" into jb-mr1.1-dev

* commit '8c470f16db291e257ac538bd0ac2a9354d34010c':
  Fix a bug with some text fields

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 d1c96d4..23887c4 100644
--- a/java/src/com/android/inputmethod/latin/RichInputConnection.java
+++ b/java/src/com/android/inputmethod/latin/RichInputConnection.java
@@ -144,7 +144,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();