commit 32d475bca46577d4482d083fc42f8a5e6f82fea0
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Apr 30 01:22:32 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 30 01:22:32 2019 +0000
tree 09b422785d7139a9466c0f163a55e6a6725b37a6
parent 97364740726cbb1a004cc4491f9024f52b1f66c1
parent de68f8097c67734be1c46ce39a1e4ecb4cc5abef

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

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