commit a74ae9c451a057e7580737df328d5a972fee17af
author Jean Chalard <jchalard@google.com> Wed Aug 14 16:00:28 2013 +0900
committer Jean Chalard <jchalard@google.com> Wed Aug 14 16:00:28 2013 +0900
tree 516653cc822f50397f528ed51f6277a91f551413
parent 53830bf464e954e314617c568e6697a9c469a814

Fix a bug with surrogate pairs

Bug: 10316781
Change-Id: I528c59c8823cda11975cb01b0ae59f12cfadef3b

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 08a5429..5323f2b 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -2555,8 +2555,8 @@
             }
         }
         mWordComposer.setComposingWord(typedWord, mKeyboardSwitcher.getKeyboard());
-        // TODO: this is in chars but the callee expects code points!
-        mWordComposer.setCursorPositionWithinWord(numberOfCharsInWordBeforeCursor);
+        mWordComposer.setCursorPositionWithinWord(
+                typedWord.codePointCount(0, numberOfCharsInWordBeforeCursor));
         mConnection.setComposingRegion(
                 mLastSelectionStart - numberOfCharsInWordBeforeCursor,
                 mLastSelectionEnd + range.getNumberOfCharsInWordAfterCursor());