aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-01-06 23:59:08 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-06 23:59:08 -0800
commitf8b49631fdb0d9abc0f760bc94a7a519975c7ff9 (patch)
tree3f7f8926121acb47ff157647fa092b5487704bc6
parent0991d8e92200035335f62907b0aa3937e1253651 (diff)
parent42e83c7f06a1683b27a11564aeb9f3999b10382f (diff)
downloadlatinime-f8b49631fdb0d9abc0f760bc94a7a519975c7ff9.tar.gz
latinime-f8b49631fdb0d9abc0f760bc94a7a519975c7ff9.tar.xz
latinime-f8b49631fdb0d9abc0f760bc94a7a519975c7ff9.zip
am 42e83c7f: Fix a race condition.
* commit '42e83c7f06a1683b27a11564aeb9f3999b10382f': Fix a race condition.
-rw-r--r--java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
index b365003a5..c867ab3d3 100644
--- a/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
+++ b/java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java
@@ -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.