Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 54f4f91d: Merge "avert 2500ms wait in InputMethodManager" into jb-mr1-dev

Browse Source 
* commit '54f4f91d7c519df0a913528d05ac26372fb2d7e2':
  avert 2500ms wait in InputMethodManager
This commit is contained in:
Victoria Lease
2012-08-24 08:04:03 -07:00
committed by Android Git Automerger
parent da88ba4737 54f4f91d7c
commit 73eebac05d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/view/inputmethod/InputMethodManager.java
View File

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