diff options
| -rw-r--r-- | core/java/android/view/inputmethod/InputMethodManager.java | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java index 41ef44e1ac1f..3cac1e5f7d6e 100644 --- a/core/java/android/view/inputmethod/InputMethodManager.java +++ b/core/java/android/view/inputmethod/InputMethodManager.java @@ -2657,17 +2657,6 @@ public final class InputMethodManager { } } - if (windowGainingFocus == null) { - windowGainingFocus = view.getWindowToken(); - if (windowGainingFocus == null) { - Log.e(TAG, "ABORT input: ServedView must be attached to a Window"); - return false; - } - startInputFlags = getStartInputFlags(view, startInputFlags); - softInputMode = view.getViewRootImpl().mWindowAttributes.softInputMode; - windowFlags = view.getViewRootImpl().mWindowAttributes.flags; - } - // Now we need to get an input connection from the served view. // This is complicated in a couple ways: we can't be holding our lock // when calling out to the view, and we need to make sure we call into @@ -2690,6 +2679,17 @@ public final class InputMethodManager { return false; } + if (windowGainingFocus == null) { + windowGainingFocus = view.getWindowToken(); + if (windowGainingFocus == null) { + Log.e(TAG, "ABORT input: ServedView must be attached to a Window"); + return false; + } + startInputFlags = getStartInputFlags(view, startInputFlags); + softInputMode = view.getViewRootImpl().mWindowAttributes.softInputMode; + windowFlags = view.getViewRootImpl().mWindowAttributes.flags; + } + // Okay we are now ready to call into the served view and have it // do its stuff. // Life is good: let's hook everything up! |