am 55387ba4: am 9fbeeb60: Merge "Revert "[HW7] Introduce consumed events"" into lmp-dev

* commit '55387ba41731460a412fe4f39c081ff9f6a550f2':
  Revert "[HW7] Introduce consumed events"

1 files changed, 2 insertions, 1 deletions

diff --git a/java/src/com/android/inputmethod/event/DeadKeyCombiner.java b/java/src/com/android/inputmethod/event/DeadKeyCombiner.java
index 342f499c9..bef4d8594 100644
--- a/java/src/com/android/inputmethod/event/DeadKeyCombiner.java
+++ b/java/src/com/android/inputmethod/event/DeadKeyCombiner.java
@@ -32,11 +32,12 @@ public class DeadKeyCombiner implements Combiner {
 
     @Override
     public Event processEvent(final ArrayList<Event> previousEvents, final Event event) {
+        if (null == event) return null; // Just in case some combiner is broken
         if (TextUtils.isEmpty(mDeadSequence)) {
             if (event.isDead()) {
                 mDeadSequence.appendCodePoint(event.mCodePoint);
             }
-            return Event.createConsumedEvent(event);
+            return event;
         } else {
             // TODO: Allow combining for several dead chars rather than only the first one.
             // The framework doesn't know how to do this now.