commit 90261839dce5e7f29114735f5ce1f51f9ab4aa27
author Tony Wickham <twickham@google.com> Mon Apr 29 18:30:27 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Apr 29 18:30:27 2019 -0700
tree 09b422785d7139a9466c0f163a55e6a6725b37a6
parent 14f33b7ee035c44792a34f7423de7a7bd486224f
parent 32d475bca46577d4482d083fc42f8a5e6f82fea0

Merge "Add null check before removing live tile overlay" into ub-launcher3-qt-dev
am: 32d475bca4

Change-Id: I1f3807a1ce735d0334a9b73dcdbf99a9aced5ad9

quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java
index 3797e87..52d301c 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java
@@ -1076,7 +1076,9 @@
             @Override
             public void onAnimationStart(Animator animation) {
                 homeAnim.dispatchOnStart();
-                mActivity.getRootView().getOverlay().remove(mLiveTileOverlay);
+                if (mActivity != null) {
+                    mActivity.getRootView().getOverlay().remove(mLiveTileOverlay);
+                }
             }
 
             @Override