Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 580bb919 authored by Satoshi Kataoka's avatar Satoshi Kataoka Committed by Android Git Automerger
Browse files

am faf45d25: am ebf7e285: Merge "Close the current input method when attached... 

am faf45d25: am ebf7e285: Merge "Close the current input method when attached view doesn\'t have a handler" into jb-mr1-dev

* commit 'faf45d25':
  Close the current input method when attached view doesn't have a handler
parents 9b8c0095 faf45d25

core/java/android/view/inputmethod/InputMethodManager.java

+5 −2
Original line number Diff line number Diff line
@@ -1078,8 +1078,11 @@ public final class InputMethodManager { 
        Handler vh = view.getHandler();

        if (vh == null) {

            // If the view doesn't have a handler, something has changed out

            // from under us, so just bail.

            if (DEBUG) Log.v(TAG, "ABORT input: no handler for view!");

            // from under us, so just close the current input.

            // If we don't close the current input, the current input method can remain on the

            // screen without a connection.

            if (DEBUG) Log.v(TAG, "ABORT input: no handler for view! Close current input.");

            closeCurrentInput();

            return false;

        }

        if (vh.getLooper() != Looper.myLooper()) {

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

+1 −1
Original line number Diff line number Diff line
@@ -1843,7 +1843,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 


                if (mCurFocusedWindow == windowToken) {

                    Slog.w(TAG, "Window already focused, ignoring focus gain of: " + client

                            + " attribute=" + attribute);

                            + " attribute=" + attribute + ", token = " + windowToken);

                    if (attribute != null) {

                        return startInputUncheckedLocked(cs, inputContext, attribute,

                                controlFlags);