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

Commit 419ad1e3 authored by satok's avatar satok Committed by Android (Google) Code Review
Browse files

Merge "Fix a bug with IME blinking just after leaving the lock screen"

parents f6710615 05a6cbe2

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

+6 −2
Original line number Diff line number Diff line
@@ -405,9 +405,11 @@ public final class InputMethodManager { 
                            }

                            // Check focus again in case that "onWindowFocus" is called before

                            // handling this message.

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

                                checkFocus(mHasBeenInactive);

                            }

                        }

                    }

                    return;

                }

            }
@@ -1202,7 +1204,9 @@ public final class InputMethodManager { 
            }

            if (DEBUG) Log.v(TAG, "checkFocus: view=" + mServedView

                    + " next=" + mNextServedView

                    + " forceNewFocus=" + forceNewFocus);

                    + " forceNewFocus=" + forceNewFocus

                    + " package="

                    + (mServedView != null ? mServedView.getContext().getPackageName() : "<none>"));



            if (mNextServedView == null) {

                finishInputLocked();