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

Commit 241eac21 authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Clean-up a workaround that is no longer necessary. 

With the previous commit [1], now Bug 27868748 is fixed and Bug 6789252
is no longer reproducible even without a workaround [2] for that.  Hence
this CL logically reverts [2] in favor of simplicity.

  [1]: If2a03bc84d318775fd4a197fa43acde086eda442
       aaa38c9f
  [2]: I66f51da1299532793ef8fa700f35b0811670f235
       4e5184f9

Bug: 27868748
Change-Id: Ic59af43343eb44d1d2c23a3f4018565e7a75b143
parent 9194f344

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

+5 −10
Original line number Diff line number Diff line
@@ -493,12 +493,7 @@ public final class InputMethodManager { 
                        // Check focus again in case that "onWindowFocus" is called before

                        // handling this message.

                        if (mServedView != null && mServedView.hasWindowFocus()) {

                            // Please note that this handler thread could be different

                            // from a thread that created mServedView. That could happen

                            // the current activity is running in the system process.

                            // In that case, we really should not call

                            // mServedInputConnectionWrapper.finishComposingText().

                            if (checkFocusNoStartInput(mHasBeenInactive, false)) {

                            if (checkFocusNoStartInput(mHasBeenInactive)) {

                                final int reason = active ?

                                        InputMethodClient.START_INPUT_REASON_ACTIVATED_BY_IMMS :

                                        InputMethodClient.START_INPUT_REASON_DEACTIVATED_BY_IMMS;
@@ -1372,12 +1367,12 @@ public final class InputMethodManager { 
     * @hide

     */

    public void checkFocus() {

        if (checkFocusNoStartInput(false, true)) {

        if (checkFocusNoStartInput(false)) {

            startInputInner(InputMethodClient.START_INPUT_REASON_CHECK_FOCUS, null, 0, 0, 0);

        }

    }



    private boolean checkFocusNoStartInput(boolean forceNewFocus, boolean finishComposingText) {

    private boolean checkFocusNoStartInput(boolean forceNewFocus) {

        // This is called a lot, so short-circuit before locking.

        if (mServedView == mNextServedView && !forceNewFocus) {

            return false;
@@ -1411,7 +1406,7 @@ public final class InputMethodManager { 
            mServedConnecting = true;

        }



        if (finishComposingText && ic != null) {

        if (ic != null) {

            ic.finishComposingText();

        }
@@ -1457,7 +1452,7 @@ public final class InputMethodManager { 
            controlFlags |= CONTROL_WINDOW_FIRST;

        }

        

        if (checkFocusNoStartInput(forceNewFocus, true)) {

        if (checkFocusNoStartInput(forceNewFocus)) {

            // We need to restart input on the current focus view.  This

            // should be done in conjunction with telling the system service

            // about the window gaining focus, to help make the transition