Merge "Revert "Fix IMMS#mInputShown state inconsistency."" into mnc-dev

This commit is contained in:
Yohei Yukawa
2015-05-15 17:40:39 +00:00
committed by Android (Google) Code Review

View File

@@ -1704,7 +1704,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
vis = 0; vis = 0;
} }
mImeWindowVis = vis; mImeWindowVis = vis;
mInputShown = ((mImeWindowVis & InputMethodService.IME_VISIBLE) != 0);
mBackDisposition = backDisposition; mBackDisposition = backDisposition;
// mImeWindowVis should be updated before calling shouldShowImeSwitcherLocked(). // mImeWindowVis should be updated before calling shouldShowImeSwitcherLocked().
final boolean needsToShowImeSwitcher = shouldShowImeSwitcherLocked(); final boolean needsToShowImeSwitcher = shouldShowImeSwitcherLocked();