diff options
| author | satok <satok@google.com> | 2012-04-05 23:04:08 +0900 |
|---|---|---|
| committer | satok <satok@google.com> | 2012-04-05 23:11:39 +0900 |
| commit | 05a6cbe2863614a1761adc033c905458b27be47e (patch) | |
| tree | d6f929c9e2da25c7799fa857af4cf7ae7ae81e70 /core/java/android | |
| parent | 8fa23393e9f9de1c65a45f49463e745de498c557 (diff) | |
| download | frameworks_base-05a6cbe2863614a1761adc033c905458b27be47e.zip frameworks_base-05a6cbe2863614a1761adc033c905458b27be47e.tar.gz frameworks_base-05a6cbe2863614a1761adc033c905458b27be47e.tar.bz2 | |
Fix a bug with IME blinking just after leaving the lock screen
Bug: 6286786
Change-Id: I9ee42482f7abffaefec31f0c4a661bef7c230137
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/inputmethod/InputMethodManager.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java index 17dbde8..067be39 100644 --- a/core/java/android/view/inputmethod/InputMethodManager.java +++ b/core/java/android/view/inputmethod/InputMethodManager.java @@ -405,7 +405,9 @@ public final class InputMethodManager { } // 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 @@ 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(); |