Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a0a3cda authored by Jean Chalard's avatar Jean Chalard Committed by Android (Google) Code Review
Browse files

Merge "Revert "Revert "Fix a race condition."""

parents ad78058a f628629f

java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java

+5 −2
Original line number Diff line number Diff line
@@ -1114,8 +1114,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.