aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/RichInputConnection.java
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2013-04-10 22:05:34 +0900
committerJean Chalard <jchalard@google.com>2013-04-12 20:53:06 +0900
commit02ce3dc2d11aba2b521f85223af1f870207b81dc (patch)
treecc92e97d9c34236d4cdbf770dc0dd0366e92e6dd /java/src/com/android/inputmethod/latin/RichInputConnection.java
parentd24f93971292451c7a16456fecb8eff5deaa2c37 (diff)
downloadlatinime-02ce3dc2d11aba2b521f85223af1f870207b81dc.tar.gz
latinime-02ce3dc2d11aba2b521f85223af1f870207b81dc.tar.xz
latinime-02ce3dc2d11aba2b521f85223af1f870207b81dc.zip
Fix a bug with bad application completions
Bug: 8561056 Change-Id: I91fb0ac76dabfc841bafc0e2c0ea9f63e6f604f9
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);