diff options
author | Yohei Yukawa <yukawa@google.com> | 2015-05-08 17:11:21 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-08 17:11:22 +0000 |
commit | 93b6dae9e5e3875c4944ed211af3daf6530507e2 (patch) | |
tree | 25d6fa35f5433fb6423733a776e9347575db3ed4 /services | |
parent | 3974fb239392099608f969254c4d86e7d13ab32d (diff) | |
parent | 8d4a9117fbd0aaf03b8486ef920c73894a12cfcd (diff) | |
download | frameworks_base-93b6dae9e5e3875c4944ed211af3daf6530507e2.zip frameworks_base-93b6dae9e5e3875c4944ed211af3daf6530507e2.tar.gz frameworks_base-93b6dae9e5e3875c4944ed211af3daf6530507e2.tar.bz2 |
Merge "Fix IMMS#mInputShown state inconsistency." into mnc-dev
Diffstat (limited to 'services')
-rw-r--r-- | services/core/java/com/android/server/InputMethodManagerService.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java index 9511f54..e856a93 100644 --- a/services/core/java/com/android/server/InputMethodManagerService.java +++ b/services/core/java/com/android/server/InputMethodManagerService.java @@ -1695,6 +1695,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub vis = 0; } mImeWindowVis = vis; + mInputShown = ((mImeWindowVis & InputMethodService.IME_VISIBLE) != 0); mBackDisposition = backDisposition; final boolean iconVisibility = ((vis & (InputMethodService.IME_ACTIVE)) != 0) && (mWindowManagerService.isHardKeyboardAvailable() |