avert 2500ms wait in InputMethodManager

When dispatching input events to the main thread, the event is
handled directly rather than queued. If we have a timeout waiting for
the event to happen, it has to be registered before we call the
dispatcher, otherwise we'll wait for the timeout even though the event
has already been handled.

Bug: 6734044
Change-Id: I6826163dbc6133b385cf1076bb077fb4e82870a1

Author: Victoria Lease

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

@@ -1577,8 +1577,8 @@ public void dispatchKeyEvent(Context context, int seq, KeyEvent key,
                     try {
                         if (DEBUG) Log.v(TAG, "DISPATCH KEY: " + mCurMethod);
                         final long startTime = SystemClock.uptimeMillis();
-                        mCurMethod.dispatchKeyEvent(seq, key, mInputMethodCallback);
                         enqueuePendingEventLocked(startTime, seq, mCurId, callback);
+                        mCurMethod.dispatchKeyEvent(seq, key, mInputMethodCallback);
                         return;
                     } catch (RemoteException e) {
                         Log.w(TAG, "IME died: " + mCurId + " dropping: " + key, e);
@@ -1602,8 +1602,8 @@ void dispatchTrackballEvent(Context context, int seq, MotionEvent motion,
                 try {
                     if (DEBUG) Log.v(TAG, "DISPATCH TRACKBALL: " + mCurMethod);
                     final long startTime = SystemClock.uptimeMillis();
-                    mCurMethod.dispatchTrackballEvent(seq, motion, mInputMethodCallback);
                     enqueuePendingEventLocked(startTime, seq, mCurId, callback);
+                    mCurMethod.dispatchTrackballEvent(seq, motion, mInputMethodCallback);
                     return;
                 } catch (RemoteException e) {
                     Log.w(TAG, "IME died: " + mCurId + " dropping trackball: " + motion, e);