From de68f8097c67734be1c46ce39a1e4ecb4cc5abef Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Mon, 29 Apr 2019 17:30:30 -0700
Subject: Add null check before removing live tile overlay

Bug: 131630813
Change-Id: I6d2c39c61aa918b11dd3d15703fe6ca52c19778d
---
 .../src/com/android/quickstep/WindowTransformSwipeHandler.java        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 afc4fcb59..baac88025 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java
@@ -1062,7 +1062,9 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity>
             @Override
             public void onAnimationStart(Animator animation) {
                 homeAnim.dispatchOnStart();
-                mActivity.getRootView().getOverlay().remove(mLiveTileOverlay);
+                if (mActivity != null) {
+                    mActivity.getRootView().getOverlay().remove(mLiveTileOverlay);
+                }
             }
 
             @Override
-- 
cgit v1.2.3