aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/RichInputConnection.java
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2013-04-12 05:30:25 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-12 05:30:25 -0700
commit991b1ef83e8f92c29ddec6685d91c24f1875eeba (patch)
treecc92e97d9c34236d4cdbf770dc0dd0366e92e6dd /java/src/com/android/inputmethod/latin/RichInputConnection.java
parent68b392cc1208036df06ca2c94176b2bc3b5a690d (diff)
parent02ce3dc2d11aba2b521f85223af1f870207b81dc (diff)
downloadlatinime-991b1ef83e8f92c29ddec6685d91c24f1875eeba.tar.gz
latinime-991b1ef83e8f92c29ddec6685d91c24f1875eeba.tar.xz
latinime-991b1ef83e8f92c29ddec6685d91c24f1875eeba.zip
am 02ce3dc2: Fix a bug with bad application completions
* commit '02ce3dc2d11aba2b521f85223af1f870207b81dc': Fix a bug with bad application completions
Diffstat (limited to 'java/src/com/android/inputmethod/latin/RichInputConnection.java')
-rw-r--r--java/src/com/android/inputmethod/latin/RichInputConnection.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/RichInputConnection.java b/java/src/com/android/inputmethod/latin/RichInputConnection.java
index 16744d1f0..db68b0b96 100644
--- a/java/src/com/android/inputmethod/latin/RichInputConnection.java
+++ b/java/src/com/android/inputmethod/latin/RichInputConnection.java
@@ -392,7 +392,9 @@ public final class RichInputConnection {
public void commitCompletion(final CompletionInfo completionInfo) {
if (DEBUG_BATCH_NESTING) checkBatchEdit();
if (DEBUG_PREVIOUS_TEXT) checkConsistencyForDebug();
- final CharSequence text = completionInfo.getText();
+ CharSequence text = completionInfo.getText();
+ // text should never be null, but just in case, it's better to insert nothing than to crash
+ if (null == text) text = "";
mCommittedTextBeforeComposingText.append(text);
mCurrentCursorPosition += text.length() - mComposingText.length();
mComposingText.setLength(0);