diff options
| author | satok <satok@google.com> | 2012-04-05 22:12:36 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-05 22:12:36 -0700 |
| commit | 419ad1e3b1f82c94ade87a70e7a4d033f9cab818 (patch) | |
| tree | 2416da8d808ccf4b65aace3056a99fae4103fa60 | |
| parent | f6710615c6cc1746d1ecc7aebc9afed457dcca41 (diff) | |
| parent | 05a6cbe2863614a1761adc033c905458b27be47e (diff) | |
| download | frameworks_base-419ad1e3b1f82c94ade87a70e7a4d033f9cab818.zip frameworks_base-419ad1e3b1f82c94ade87a70e7a4d033f9cab818.tar.gz frameworks_base-419ad1e3b1f82c94ade87a70e7a4d033f9cab818.tar.bz2 | |
Merge "Fix a bug with IME blinking just after leaving the lock screen"
| -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(); |