commit 8bf6064fe0cb2e961e4e2d07232b9102fdad0f01
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Wed Jul 18 22:55:55 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Wed Jul 18 22:55:55 2018 +0000
tree bfd6c57a4968d79f7c87a1afd19d9b16922e3528
parent 498a9bd559d705d4fd377912e17b7f6ffa514dfb
parent 7cc878b5aeefe06adaf0217be429b3f36a86d19b

[automerger] Add null check before playing recents scale down anim am: 7cc878b5ae

Change-Id: Ie10ecb7da0307d17c408979d4f6a85906d278c11

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 d37ac49..3c69973 100644
--- a/quickstep/src/com/android/quickstep/ActivityControlHelper.java
+++ b/quickstep/src/com/android/quickstep/ActivityControlHelper.java
@@ -299,6 +299,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()) {