summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-08-17 07:48:30 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-17 07:48:30 -0700
commit234325b832136dcdbed0c86fdcefa95fb04451a4 (patch)
tree11fdba6645b83fd2432570e9beefb1b450f4f804 /services
parent18dd95f451f866804d19797bc47ab5a2821c0020 (diff)
parentc708e38356e9c381b640ef96db3b0b0fdd41d433 (diff)
downloadframeworks_base-234325b832136dcdbed0c86fdcefa95fb04451a4.zip
frameworks_base-234325b832136dcdbed0c86fdcefa95fb04451a4.tar.gz
frameworks_base-234325b832136dcdbed0c86fdcefa95fb04451a4.tar.bz2
am c708e383: Merge "Revert "InputMethodService: Fix ignore case in showInputMethodPickerFromClient""
Merge commit 'c708e38356e9c381b640ef96db3b0b0fdd41d433' into gingerbread-plus-aosp * commit 'c708e38356e9c381b640ef96db3b0b0fdd41d433': Revert "InputMethodService: Fix ignore case in showInputMethodPickerFromClient"
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/InputMethodManagerService.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java
index ff3f80f..2e33cf1 100644
--- a/services/java/com/android/server/InputMethodManagerService.java
+++ b/services/java/com/android/server/InputMethodManagerService.java
@@ -1218,7 +1218,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
if (mCurClient == null || client == null
|| mCurClient.client.asBinder() != client.asBinder()) {
Slog.w(TAG, "Ignoring showInputMethodDialogFromClient of: " + client);
- return;
}
mHandler.sendEmptyMessage(MSG_SHOW_IM_PICKER);