commit ca8edea785bd53efed228bf0d4838de0bb9e22fa
author gaoshang <gaoshang@xiaomi.com> Thu May 04 03:51:43 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 04 03:51:43 2017 +0000
tree 16b806e450a027f3f73c8453bb85b8794cb13997
parent 4cec063b7ee0448501b16c343abade5aac92d8b0
parent 0f722b529c2395d1f937e99e54b20b589c817e86

Merge "fix KeyEvent can't correctly finish when inputmethod time out happend" am: 36247646e3
am: 0f722b529c

Change-Id: Ic315d3c7d7cfc0132237de29fc7426d412cdb96b

core/java/android/view/inputmethod/InputMethodManager.java

diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java
index 2e9cbf2..eef1cf5 100644
--- a/core/java/android/view/inputmethod/InputMethodManager.java
+++ b/core/java/android/view/inputmethod/InputMethodManager.java
@@ -1920,7 +1920,7 @@
                 Trace.traceCounter(Trace.TRACE_TAG_INPUT, PENDING_EVENT_COUNTER,
                         mPendingEvents.size());
 
-                Message msg = mH.obtainMessage(MSG_TIMEOUT_INPUT_EVENT, p);
+                Message msg = mH.obtainMessage(MSG_TIMEOUT_INPUT_EVENT, seq, 0, p);
                 msg.setAsynchronous(true);
                 mH.sendMessageDelayed(msg, INPUT_METHOD_NOT_RESPONDING_TIMEOUT);
                 return DISPATCH_IN_PROGRESS;