commit 5320b326a48a473f58d0e99a81d75f277254b958
author Vairavan Srinivasan <vairav@codeaurora.org> Wed Aug 11 12:39:24 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 11 12:39:24 2010 -0700
tree 8d4f37bb77ad5d2e56e958bef006b65248b2d172
parent ca542851b0db11071266b84ed77cc21dc0e1f434
parent 79cb9a5d2d455af22c56b8cee045962c61668422

am 79cb9a5d: am f2e67a57: InputMethodService: Fix ignore case in showInputMethodPickerFromClient

Merge commit '79cb9a5d2d455af22c56b8cee045962c61668422'

* commit '79cb9a5d2d455af22c56b8cee045962c61668422':
  InputMethodService: Fix ignore case in showInputMethodPickerFromClient

services/java/com/android/server/InputMethodManagerService.java

diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java
index c61baad..164142e 100644
--- a/services/java/com/android/server/InputMethodManagerService.java
+++ b/services/java/com/android/server/InputMethodManagerService.java
@@ -1220,6 +1220,7 @@
             if (mCurClient == null || client == null
                     || mCurClient.client.asBinder() != client.asBinder()) {
                 Slog.w(TAG, "Ignoring showInputMethodDialogFromClient of: " + client);
+                return;
             }
 
             mHandler.sendEmptyMessage(MSG_SHOW_IM_PICKER);