diff options
| author |   Keisuke Kuroyanagi <ksk@google.com> | 2014-10-23 13:22:52 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-10-23 13:22:52 +0000 |
| commit | 1d947b3ff7567d276d80b098723d9a9e340dd46b (patch) | |
| tree | 44b1de67a17c052414739229363894fff4f96606 /java | |
| parent | bdae18c03f1c5afa44233f23fc7283568c8ece32 (diff) | |
| parent | 989699a69003e1af89309692eb88b7611ebe071f (diff) | |
| download | latinime-1d947b3ff7567d276d80b098723d9a9e340dd46b.tar.gz latinime-1d947b3ff7567d276d80b098723d9a9e340dd46b.tar.xz latinime-1d947b3ff7567d276d80b098723d9a9e340dd46b.zip | |
am 989699a6: Fix unit tests (InputLogicTestsDeadKeys).
* commit '989699a69003e1af89309692eb88b7611ebe071f':
Fix unit tests (InputLogicTestsDeadKeys).
Diffstat (limited to 'java')
| -rw-r--r-- | java/src/com/android/inputmethod/event/DeadKeyCombiner.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/event/DeadKeyCombiner.java b/java/src/com/android/inputmethod/event/DeadKeyCombiner.java index 9d7cc0561..7b89b043d 100644 --- a/java/src/com/android/inputmethod/event/DeadKeyCombiner.java +++ b/java/src/com/android/inputmethod/event/DeadKeyCombiner.java @@ -218,7 +218,10 @@ public class DeadKeyCombiner implements Combiner { @Nonnull private static Event createEventChainFromSequence(final @Nonnull CharSequence text, @Nonnull final Event originalEvent) { - Event lastEvent = originalEvent; + if (text.length() <= 0) { + return originalEvent; + } + Event lastEvent = null; int codePoint = 0; for (int i = text.length(); i > 0; i -= Character.charCount(codePoint)) { codePoint = Character.codePointBefore(text, i); |