From be96408b801666bf196adb0eabff4839e51e63ed Mon Sep 17 00:00:00 2001
From: satok <satok@google.com>
Date: Fri, 3 Jun 2011 14:45:50 +0900
Subject: [PATCH] (Do not merge) Backport a fix for InputMethodManager.java

Bug: 4517456

Original CL: Icec380f3ca05cf798cc4b82155d0cecf178633a5

Change-Id: I579fb1ee1b53d312f7cfc5c689d4500cb875352e
---
 core/java/android/view/inputmethod/InputMethodManager.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java
index a39c7c70042d4..83d2a7927af7d 100644
--- a/core/java/android/view/inputmethod/InputMethodManager.java
+++ b/core/java/android/view/inputmethod/InputMethodManager.java
@@ -998,13 +998,13 @@ public final class InputMethodManager {
                 if (DEBUG) Log.v(TAG, "START INPUT: " + view + " ic="
                         + ic + " tba=" + tba + " initial=" + initial);
                 InputBindResult res = mService.startInput(mClient,
-                        servedContext, tba, initial, mCurMethod == null);
+                        servedContext, tba, initial, true);
                 if (DEBUG) Log.v(TAG, "Starting input: Bind result=" + res);
                 if (res != null) {
                     if (res.id != null) {
                         mBindSequence = res.sequence;
                         mCurMethod = res.method;
-                    } else {
+                    } else if (mCurMethod == null) {
                         // This means there is no input method available.
                         if (DEBUG) Log.v(TAG, "ABORT input: no input method!");
                         return;