diff options
| author | Yohei Yukawa <yukawa@google.com> | 2015-05-15 17:40:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-15 17:40:44 +0000 |
| commit | 79d0c080a060b340e87d9211f5b174613b67d947 (patch) | |
| tree | 77c48ee2c1d4289ffd41a36bbff3f685569876a7 | |
| parent | b3fa8bf221c239ebce7f5cdfd33dadcda9f137b3 (diff) | |
| parent | 6640d21b2e8d16190fdf79cb3ec4b7694a1ea90b (diff) | |
| download | frameworks_base-79d0c080a060b340e87d9211f5b174613b67d947.zip frameworks_base-79d0c080a060b340e87d9211f5b174613b67d947.tar.gz frameworks_base-79d0c080a060b340e87d9211f5b174613b67d947.tar.bz2 | |
Merge "Revert "Fix IMMS#mInputShown state inconsistency."" into mnc-dev
| -rw-r--r-- | services/core/java/com/android/server/InputMethodManagerService.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java index 256a662..1f6c473 100644 --- a/services/core/java/com/android/server/InputMethodManagerService.java +++ b/services/core/java/com/android/server/InputMethodManagerService.java @@ -1704,7 +1704,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub vis = 0; } mImeWindowVis = vis; - mInputShown = ((mImeWindowVis & InputMethodService.IME_VISIBLE) != 0); mBackDisposition = backDisposition; // mImeWindowVis should be updated before calling shouldShowImeSwitcherLocked(). final boolean needsToShowImeSwitcher = shouldShowImeSwitcherLocked(); |