diff options
| author | satok <satok@google.com> | 2011-06-02 23:25:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-02 23:25:14 -0700 |
| commit | 752737076dd0424998b8399e82af00bf745ba22f (patch) | |
| tree | b44b7ee91f997bee0d5ed5aec03d86cb9a9159f3 | |
| parent | d247ee41d60fc261d2387625995f9ff3da442019 (diff) | |
| parent | e10de072d50cbe6984151cbbdba4dd2f2e8310b9 (diff) | |
| download | frameworks_base-752737076dd0424998b8399e82af00bf745ba22f.zip frameworks_base-752737076dd0424998b8399e82af00bf745ba22f.tar.gz frameworks_base-752737076dd0424998b8399e82af00bf745ba22f.tar.bz2 | |
am e10de072: am be96408b: (Do not merge) Backport a fix for InputMethodManager.java
* commit 'e10de072d50cbe6984151cbbdba4dd2f2e8310b9':
(Do not merge) Backport a fix for InputMethodManager.java
| -rw-r--r-- | core/java/android/view/inputmethod/InputMethodManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java index a39c7c7..83d2a79 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; |