nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

am be3be424: Fix a bug that happens upon a race condition

Browse source 
* commit 'be3be424a38ecb46bb24423be42ad290e896c6cc':
  Fix a bug that happens upon a race condition
This commit is contained in:
Jean Chalard 2013-09-20 03:53:07 -07:00 committed by Android Git Automerger
commit 2e10784102
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
java/src/com/android/inputmethod/latin/LatinIME.java
View file

@ -2746,6 +2746,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
final TextRange range = mConnection.getWordRangeAtCursor(currentSettings.mWordSeparators, final TextRange range = mConnection.getWordRangeAtCursor(currentSettings.mWordSeparators,
0 /* additionalPrecedingWordsCount */); 0 /* additionalPrecedingWordsCount */);
if (null == range) return; // Happens if we don't have an input connection at all if (null == range) return; // Happens if we don't have an input connection at all
if (range.length() <= 0) return; // Race condition. No text to resume on, so bail out.
// If for some strange reason (editor bug or so) we measure the text before the cursor as // If for some strange reason (editor bug or so) we measure the text before the cursor as
// longer than what the entire text is supposed to be, the safe thing to do is bail out. // longer than what the entire text is supposed to be, the safe thing to do is bail out.
final int numberOfCharsInWordBeforeCursor = range.getNumberOfCharsInWordBeforeCursor(); final int numberOfCharsInWordBeforeCursor = range.getNumberOfCharsInWordBeforeCursor();

4
java/src/com/android/inputmethod/latin/utils/TextRange.java
View file

@ -40,6 +40,10 @@ public final class TextRange {
return mWordAtCursorEndIndex - mCursorIndex; return mWordAtCursorEndIndex - mCursorIndex;
} }
public int length() {
return mWord.length();
}
/** /**
* Gets the suggestion spans that are put squarely on the word, with the exact start * Gets the suggestion spans that are put squarely on the word, with the exact start
* and end of the span matching the boundaries of the word. * and end of the span matching the boundaries of the word.