commit cb1cc0d0deb77eb876d393096e63ecf0dbb34c87
author Jean Chalard <jchalard@google.com> Mon Aug 01 04:17:22 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 01 04:17:22 2011 -0700
tree 6af4d035760071c19ef36736981ba4e75ace7abc
parent 20cb6e80785627119b02817cb5f91d2f3ff174d6
parent f2f971531904026663a98629eec6eccf83e32faf

Merge "Try to compensate for a race condition."

java/src/com/android/inputmethod/latin/LatinIME.java

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 97c2226..bdcbfbc 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -789,7 +789,8 @@
         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) {