am 1d1a3d52: Merge "Fix a bug where null would be converted to "null""

* commit '1d1a3d52b8f12766c7d2c1f2033217fce502f49a':
  Fix a bug where null would be converted to "null"
This commit is contained in:
Jean Chalard 2013-09-20 00:21:54 -07:00 committed by Android Git Automerger
commit 4f5f3ebc2f

View file

@ -233,8 +233,10 @@ public final class RichInputConnection {
// getCapsMode should be updated to be able to return a "not enough info" result so that // getCapsMode should be updated to be able to return a "not enough info" result so that
// we can get more context only when needed. // we can get more context only when needed.
if (TextUtils.isEmpty(mCommittedTextBeforeComposingText) && 0 != mExpectedCursorPosition) { if (TextUtils.isEmpty(mCommittedTextBeforeComposingText) && 0 != mExpectedCursorPosition) {
mCommittedTextBeforeComposingText.append( final CharSequence textBeforeCursor = getTextBeforeCursor(DEFAULT_TEXT_CACHE_SIZE, 0);
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 // This never calls InputConnection#getCapsMode - in fact, it's a static method that
// never blocks or initiates IPC. // never blocks or initiates IPC.