am 5feda45a: Merge "[CB15] Remove a redundant variable."

* commit '5feda45a6fd89e95b07b0ff1cc9dcaf7de029da1':
  [CB15] Remove a redundant variable.

1 files changed, 12 insertions, 2 deletions

diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionary.java b/java/src/com/android/inputmethod/latin/BinaryDictionary.java
index 0aa34e82e..323d0c8a3 100644
--- a/java/src/com/android/inputmethod/latin/BinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/BinaryDictionary.java
@@ -249,8 +249,18 @@ public final class BinaryDictionary extends Dictionary {
         final boolean isGesture = composer.isBatchMode();
         if (composerSize <= 1 || !isGesture) {
             if (composerSize > MAX_WORD_LENGTH - 1) return null;
-            for (int i = 0; i < composerSize; i++) {
-                mInputCodePoints[i] = composer.getCodeAt(i);
+            final CharSequence typedWord = composer.getTypedWord();
+            final int charCount = typedWord.length();
+            int typedWordCharIndex = 0;
+            int inputCodePointIndex = 0;
+            while (typedWordCharIndex < charCount) {
+                final int codePoint = Character.codePointAt(typedWord, typedWordCharIndex);
+                mInputCodePoints[inputCodePointIndex] = codePoint;
+                typedWordCharIndex += Character.charCount(codePoint);
+                inputCodePointIndex += 1;
+                if (inputCodePointIndex >= MAX_WORD_LENGTH) {
+                    break;
+                }
             }
         }