aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2012-11-14 20:40:33 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-14 20:40:33 -0800
commit8c470f16db291e257ac538bd0ac2a9354d34010c (patch)
tree02946aa3d7148f0357a8461eeb2a8f75581108d0 /java/src
parent12c2e437949414ce52b7e40ad191f15c844726e9 (diff)
parent5dee6e69f1de114df1f258fdc62559237989dc75 (diff)
downloadlatinime-8c470f16db291e257ac538bd0ac2a9354d34010c.tar.gz
latinime-8c470f16db291e257ac538bd0ac2a9354d34010c.tar.xz
latinime-8c470f16db291e257ac538bd0ac2a9354d34010c.zip
am 5dee6e69: am 187e683a: Merge "Fix a bug with some text fields" into jb-mr1.1-dev
* commit '5dee6e69f1de114df1f258fdc62559237989dc75': Fix a bug with some text fields
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/latin/RichInputConnection.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/RichInputConnection.java b/java/src/com/android/inputmethod/latin/RichInputConnection.java
index 21441369e..75b67bfc6 100644
--- a/java/src/com/android/inputmethod/latin/RichInputConnection.java
+++ b/java/src/com/android/inputmethod/latin/RichInputConnection.java
@@ -145,7 +145,8 @@ public final class RichInputConnection {
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();