Merge "Fix IME insets animation applies again when restartInput called" into rvc-dev am: e2cd0a6b83 am: f373777d33

Change-Id: Ifb16a16887be4cf28f79884a8379ced979d493d2
2020-04-08 04:04:40 +00:00
parent 78afd858ad f373777d33
commit ac8a312acf
1 changed files with 4 additions and 0 deletions
--- a/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
@@ -3106,10 +3106,14 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
                    MSG_SHOW_SOFT_INPUT, getImeShowFlags(), reason, mCurMethod, resultReceiver,
                    showInputToken));
            mInputShown = true;
+
            if (mHaveConnection && !mVisibleBound) {
                bindCurrentInputMethodServiceLocked(
                        mCurIntent, mVisibleConnection, IME_VISIBLE_BIND_FLAGS);
                mVisibleBound = true;
+            } else {
+                // Clear the show request after the input shown.
+                mShowRequested = false;
            }
            res = true;
        } else if (mHaveConnection && SystemClock.uptimeMillis()