am 42e83c7f: Fix a race condition.

* commit '42e83c7f06a1683b27a11564aeb9f3999b10382f':
  Fix a race condition.
main
Jean Chalard 2014-01-06 23:59:08 -08:00 committed by Android Git Automerger
commit f8b49631fd
1 changed files with 5 additions and 2 deletions

View File

@ -1113,8 +1113,11 @@ public final class InputLogic {
keyboardSwitcher.getKeyboard());
mWordComposer.setCursorPositionWithinWord(
typedWord.codePointCount(0, numberOfCharsInWordBeforeCursor));
mConnection.setComposingRegion(expectedCursorPosition - numberOfCharsInWordBeforeCursor,
expectedCursorPosition + range.getNumberOfCharsInWordAfterCursor());
// TODO: Change these two lines to setComposingRegion(cursorPosition,
// cursorPosition + range.getNumberOfCharsInWordAfterCursor());
mConnection.deleteSurroundingText(numberOfCharsInWordBeforeCursor,
typedWord.length() - numberOfCharsInWordBeforeCursor);
mConnection.setComposingText(typedWord, 1);
if (suggestions.isEmpty()) {
// We come here if there weren't any suggestion spans on this word. We will try to
// compute suggestions for it instead.