commit ae71e086a2fc23257e3d6de895883135d95d7144
author Tony Wickham <twickham@google.com> Thu Jul 19 21:55:36 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 19 21:55:36 2018 +0000
tree c753731f999af39f8ee21d69ce67dedaa2fb6f6f
parent 7b8ed5a111ee6c9327528d72b550f648fd301be0
parent 7cc878b5aeefe06adaf0217be429b3f36a86d19b

Merge "Add null check before playing recents scale down anim" into ub-launcher3-edmonton-polish

quickstep/src/com/android/quickstep/ActivityControlHelper.java

diff --git a/quickstep/src/com/android/quickstep/ActivityControlHelper.java b/quickstep/src/com/android/quickstep/ActivityControlHelper.java
index 275075f..ced8754 100644
--- a/quickstep/src/com/android/quickstep/ActivityControlHelper.java
+++ b/quickstep/src/com/android/quickstep/ActivityControlHelper.java
@@ -294,6 +294,9 @@
         private void playScaleDownAnim(AnimatorSet anim, Launcher launcher) {
             RecentsView recentsView = launcher.getOverviewPanel();
             TaskView v = recentsView.getTaskViewAt(recentsView.getCurrentPage());
+            if (v == null) {
+                return;
+            }
             ClipAnimationHelper clipHelper = new ClipAnimationHelper();
             clipHelper.fromTaskThumbnailView(v.getThumbnail(), (RecentsView) v.getParent(), null);
             if (!clipHelper.getSourceRect().isEmpty() && !clipHelper.getTargetRect().isEmpty()) {