diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-04-30 01:22:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-04-30 01:22:32 +0000 |
| commit | 32d475bca46577d4482d083fc42f8a5e6f82fea0 (patch) | |
| tree | 09b422785d7139a9466c0f163a55e6a6725b37a6 | |
| parent | 97364740726cbb1a004cc4491f9024f52b1f66c1 (diff) | |
| parent | de68f8097c67734be1c46ce39a1e4ecb4cc5abef (diff) | |
| download | android_packages_apps_Trebuchet-32d475bca46577d4482d083fc42f8a5e6f82fea0.tar.gz android_packages_apps_Trebuchet-32d475bca46577d4482d083fc42f8a5e6f82fea0.tar.bz2 android_packages_apps_Trebuchet-32d475bca46577d4482d083fc42f8a5e6f82fea0.zip | |
Merge "Add null check before removing live tile overlay" into ub-launcher3-qt-dev
| -rw-r--r-- | quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java | 4 |
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 3797e8799..52d301ca9 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 @@ 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 |