diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2020-02-13 18:19:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-02-13 18:19:54 +0000 |
| commit | 29aa0e81aeb88b07fa34b58fdd540b142d993e1f (patch) | |
| tree | 09a7f56112ff4adb86853992530866841bb9788f | |
| parent | e79217d9c05db58bb3030fa8ad95b8de78d91d92 (diff) | |
| parent | f0ef89a522fb62f0cb22fb75a41b2f4a8873b023 (diff) | |
Merge "Abort dispatching animation callbacks if the root view is gone"
| -rw-r--r-- | core/java/android/view/InsetsController.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/view/InsetsController.java b/core/java/android/view/InsetsController.java index 25480683c8a8..9cd6050efc0b 100644 --- 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 |