summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author satok <satok@google.com> 2011-09-30 03:31:35 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2011-09-30 03:31:35 -0700
commit3e21c99f10de1acdd373fbb166a7618bebfceba0 (patch)
tree53b2d4994b5adf0c172a30d837b296dcab480a07
parent594cb476547b38098018e80b5f70935ff60d9551 (diff)
parent59b424c3b6121c9579fc5efcc785ba084072a5ca (diff)
Merge "Fix a logic to recconect IME in InputMethodManagerService"
-rw-r--r--services/java/com/android/server/InputMethodManagerService.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java
index 146bc944724d..bc145b1274d1 100644
--- a/services/java/com/android/server/InputMethodManagerService.java
+++ b/services/java/com/android/server/InputMethodManagerService.java
@@ -1362,13 +1362,14 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
mInputShown = true;
res = true;
} else if (mHaveConnection && SystemClock.uptimeMillis()
- < (mLastBindTime+TIME_TO_RECONNECT)) {
+ >= (mLastBindTime+TIME_TO_RECONNECT)) {
// The client has asked to have the input method shown, but
// we have been sitting here too long with a connection to the
// service and no interface received, so let's disconnect/connect
// to try to prod things along.
EventLog.writeEvent(EventLogTags.IMF_FORCE_RECONNECT_IME, mCurMethodId,
SystemClock.uptimeMillis()-mLastBindTime,1);
+ Slog.w(TAG, "Force disconnect/connect to the IME in showCurrentInputLocked()");
mContext.unbindService(this);
mContext.bindService(mCurIntent, this, Context.BIND_AUTO_CREATE);
}