From 8f02f1a118d36a1c4143b62f7e20727b2d2bf363 Mon Sep 17 00:00:00 2001 From: Jean Chalard Date: Fri, 20 Sep 2013 15:45:51 +0900 Subject: [PATCH] Fix a bug where null would be converted to "null" It's unclear what the concrete effects of this are, but they are not very strong. This only happens in corner cases, when the input connection is not active - while rotating, for example. Change-Id: I1d22459a6e94a8ecccb53cfcbc2d301b1d502204 --- .../com/android/inputmethod/latin/RichInputConnection.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/java/src/com/android/inputmethod/latin/RichInputConnection.java b/java/src/com/android/inputmethod/latin/RichInputConnection.java index a031bb3be..2ecf1463f 100644 --- a/java/src/com/android/inputmethod/latin/RichInputConnection.java +++ b/java/src/com/android/inputmethod/latin/RichInputConnection.java @@ -233,8 +233,10 @@ public final class RichInputConnection { // getCapsMode should be updated to be able to return a "not enough info" result so that // we can get more context only when needed. if (TextUtils.isEmpty(mCommittedTextBeforeComposingText) && 0 != mExpectedCursorPosition) { - mCommittedTextBeforeComposingText.append( - getTextBeforeCursor(DEFAULT_TEXT_CACHE_SIZE, 0)); + final CharSequence textBeforeCursor = getTextBeforeCursor(DEFAULT_TEXT_CACHE_SIZE, 0); + if (!TextUtils.isEmpty(textBeforeCursor)) { + mCommittedTextBeforeComposingText.append(textBeforeCursor); + } } // This never calls InputConnection#getCapsMode - in fact, it's a static method that // never blocks or initiates IPC.