Merge "Set InputMethoMananger#mCurRootView to null when window dismissed" am: 7bd18423f6

am: 9c5a6e2c6c Change-Id: I6198c9d52c19e48f61bb4d488018c067d4b80108
2018-09-19 19:35:27 -07:00
parent 21013eebd7 9c5a6e2c6c
commit 4d5ba15e69
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;
+            }
        }
    }