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

Author: satok16

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

@@ -405,7 +405,9 @@ public void handleMessage(Message msg) {
                             }
                             // Check focus again in case that "onWindowFocus" is called before
                             // handling this message.
-                            checkFocus(mHasBeenInactive);
+                            if (mServedView != null && mServedView.hasWindowFocus()) {
+                                checkFocus(mHasBeenInactive);
+                            }
                         }
                     }
                     return;
@@ -1202,7 +1204,9 @@ private boolean checkFocusNoStartInput(boolean forceNewFocus) {
             }
             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();