am 3e4c520d: Merge "Fix a failing test"

* commit '3e4c520dcf0b805bc992dab1e4bd068bb7e2d5c9':
  Fix a failing test
main
Jean Chalard 2013-11-24 20:03:15 -08:00 committed by Android Git Automerger
commit 37ba318ced
1 changed files with 3 additions and 0 deletions

View File

@ -243,6 +243,7 @@ public final class RichInputConnection {
if (DEBUG_PREVIOUS_TEXT) checkConsistencyForDebug();
mCommittedTextBeforeComposingText.append(text);
mExpectedSelStart += text.length() - mComposingText.length();
mExpectedSelEnd = mExpectedSelStart;
mComposingText.setLength(0);
if (null != mIC) {
mIC.commitText(text, i);
@ -493,6 +494,7 @@ public final class RichInputConnection {
if (DEBUG_BATCH_NESTING) checkBatchEdit();
if (DEBUG_PREVIOUS_TEXT) checkConsistencyForDebug();
mExpectedSelStart = start;
mExpectedSelEnd = end;
if (null != mIC) {
final boolean isIcValid = mIC.setSelection(start, end);
if (!isIcValid) {
@ -524,6 +526,7 @@ public final class RichInputConnection {
if (null == text) text = "";
mCommittedTextBeforeComposingText.append(text);
mExpectedSelStart += text.length() - mComposingText.length();
mExpectedSelEnd = mExpectedSelStart;
mComposingText.setLength(0);
if (null != mIC) {
mIC.commitCompletion(completionInfo);