summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2019-04-29 17:30:30 -0700
committerTony Wickham <twickham@google.com>2019-04-30 00:31:38 +0000
commitde68f8097c67734be1c46ce39a1e4ecb4cc5abef (patch)
treedb1d40392b3eb0fc7394922857d8b2c90f5d91c9
parent8bb8e56580326105f54de23dee4874e41f11e996 (diff)
downloadandroid_packages_apps_Trebuchet-de68f8097c67734be1c46ce39a1e4ecb4cc5abef.tar.gz
android_packages_apps_Trebuchet-de68f8097c67734be1c46ce39a1e4ecb4cc5abef.tar.bz2
android_packages_apps_Trebuchet-de68f8097c67734be1c46ce39a1e4ecb4cc5abef.zip
Add null check before removing live tile overlay
Bug: 131630813 Change-Id: I6d2c39c61aa918b11dd3d15703fe6ca52c19778d
-rw-r--r--quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java4
1 files changed, 3 insertions, 1 deletions
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