Merge "Merge "Set InputMethoMananger#mCurRootView to null when window dismissed" am: 7bd18423f6 am: 9c5a6e2c6c" into pi-dev-plus-aosp

am: 205f5bd249 Change-Id: I69f543dc6be8383b289e61aabb5de4bd1f8f09c1
2018-09-19 20:00:44 -07:00
parent fa30852d6f 205f5bd249
commit ef4dda2d02
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
@@ -1348,6 +1348,10 @@ public final class InputMethodManager {
                    mServedView.getWindowToken() == appWindowToken) {
                finishInputLocked();
            }
+            if (mCurRootView != null &&
+                    mCurRootView.getWindowToken() == appWindowToken) {
+                mCurRootView = null;
+            }
        }
    }