summaryrefslogtreecommitdiffstats
path: root/services/java
diff options
context:
space:
mode:
authorSatoshi Kataoka <satok@google.com>2012-10-03 21:02:19 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-03 21:02:20 -0700
commitebf7e2851cab55348153fca299c52042b125924d (patch)
tree606efaa5e836ac0d12510f074f31a65d7cc47276 /services/java
parent5b14b9698c288031fea6b40f0e1240c32ac83725 (diff)
parent3573950e0b30178dc963de3fa00aba2ebcfd552d (diff)
downloadframeworks_base-ebf7e2851cab55348153fca299c52042b125924d.zip
frameworks_base-ebf7e2851cab55348153fca299c52042b125924d.tar.gz
frameworks_base-ebf7e2851cab55348153fca299c52042b125924d.tar.bz2
Merge "Close the current input method when attached view doesn't have a handler" into jb-mr1-dev
Diffstat (limited to 'services/java')
-rw-r--r--services/java/com/android/server/InputMethodManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java
index f06bf8e..22fd508 100644
--- a/services/java/com/android/server/InputMethodManagerService.java
+++ b/services/java/com/android/server/InputMethodManagerService.java
@@ -1843,7 +1843,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
if (mCurFocusedWindow == windowToken) {
Slog.w(TAG, "Window already focused, ignoring focus gain of: " + client
- + " attribute=" + attribute);
+ + " attribute=" + attribute + ", token = " + windowToken);
if (attribute != null) {
return startInputUncheckedLocked(cs, inputContext, attribute,
controlFlags);