diff options
| author |   Jean Chalard <jchalard@google.com> | 2011-08-01 04:17:22 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2011-08-01 04:17:22 -0700 |
| commit | cb1cc0d0deb77eb876d393096e63ecf0dbb34c87 (patch) | |
| tree | 6af4d035760071c19ef36736981ba4e75ace7abc /java | |
| parent | 20cb6e80785627119b02817cb5f91d2f3ff174d6 (diff) | |
| parent | f2f971531904026663a98629eec6eccf83e32faf (diff) | |
| download | latinime-cb1cc0d0deb77eb876d393096e63ecf0dbb34c87.tar.gz latinime-cb1cc0d0deb77eb876d393096e63ecf0dbb34c87.tar.xz latinime-cb1cc0d0deb77eb876d393096e63ecf0dbb34c87.zip | |
Merge "Try to compensate for a race condition."
Diffstat (limited to 'java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 97c222695..bdcbfbcb1 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -789,7 +789,8 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar final boolean selectionChanged = (newSelStart != candidatesEnd || newSelEnd != candidatesEnd) && mLastSelectionStart != newSelStart; final boolean candidatesCleared = candidatesStart == -1 && candidatesEnd == -1; - if (((mComposingStringBuilder.length() > 0 && mHasUncommittedTypedChars) + if (!mExpectingUpdateSelection + && ((mComposingStringBuilder.length() > 0 && mHasUncommittedTypedChars) || mVoiceProxy.isVoiceInputHighlighted()) && (selectionChanged || candidatesCleared)) { if (candidatesCleared) { |