1 files changed, 5 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/event/DeadKeyCombiner.java b/java/src/com/android/inputmethod/event/DeadKeyCombiner.java
index 9d7cc0561..a3e4ad833 100644
--- a/java/src/com/android/inputmethod/event/DeadKeyCombiner.java
+++ b/java/src/com/android/inputmethod/event/DeadKeyCombiner.java
@@ -19,7 +19,7 @@ package com.android.inputmethod.event;
 import android.text.TextUtils;
 import android.util.SparseIntArray;
 
-import com.android.inputmethod.latin.Constants;
+import com.android.inputmethod.latin.common.Constants;
 
 import java.text.Normalizer;
 import java.util.ArrayList;
@@ -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);