Merge "Abort dispatching animation callbacks if the root view is gone"

2020-02-13 18:19:54 +00:00
parent e79217d9c0 f0ef89a522
commit 29aa0e81ae
1 changed files with 3 additions and 0 deletions
--- a/core/java/android/view/InsetsController.java
+++ b/core/java/android/view/InsetsController.java
@@ -882,6 +882,9 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation
        } else {
            hideDirectly(types);
        }
+        if (mViewRoot.mView == null) {
+            return;
+        }
        mViewRoot.mView.dispatchWindowInsetsAnimationPrepare(animation);
        mViewRoot.mView.getViewTreeObserver().addOnPreDrawListener(new OnPreDrawListener() {
            @Override