Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54f4f91d authored by Victoria Lease's avatar Victoria Lease Committed by Android (Google) Code Review
Browse files

Merge "avert 2500ms wait in InputMethodManager" into jb-mr1-dev

parents 78e73224 b570c64a

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

+2 −2
Original line number Diff line number Diff line
@@ -1577,8 +1577,8 @@ public final class InputMethodManager { 
                    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 @@ public final class InputMethodManager { 
                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);