Merge "Set InputMethoMananger#mCurRootView to null when window dismissed"

am: 7bd18423f6 Change-Id: Ie0127bd83b714c540bcf387a3fc74d01bd60eb13
2018-09-19 19:22:12 -07:00
parent 4007dd103f 7bd18423f6
commit 9c5a6e2c6c
1 changed files with 4 additions and 0 deletions
--- a/core/java/android/view/inputmethod/InputMethodManager.java
+++ b/core/java/android/view/inputmethod/InputMethodManager.java
@@ -1421,6 +1421,10 @@ public final class InputMethodManager {
                    mServedView.getWindowToken() == appWindowToken) {
                finishInputLocked();
            }
+            if (mCurRootView != null &&
+                    mCurRootView.getWindowToken() == appWindowToken) {
+                mCurRootView = null;
+            }
        }
    }